diff --git a/roles/base/files/dump-server-state.sh b/roles/base/files/dump-server-state.sh
index 841c5ef..d2d6b14 100644
--- a/roles/base/files/dump-server-state.sh
+++ b/roles/base/files/dump-server-state.sh
@@ -69,7 +69,8 @@ END
 }
 debug() {
     if [ "${VERBOSE}" = "1" ]; then
-        echo "$1"
+        msg="${1:-$(cat /dev/stdin)}"
+        echo "${msg}"
     fi
 }
 
@@ -292,7 +293,7 @@ task_disks() {
         for disk in ${disks}; do
             disklabel_bin=$(command -v disklabel)
             if [ -n "${disklabel_bin}" ]; then
-                last_result=$(${disklabel_bin} "${disk}" > "${dump_dir}/partitions-${disk}")
+                last_result=$(${disklabel_bin} "${disk}" 2>/dev/null > "${dump_dir}/partitions-${disk}")
                 last_rc=$?
 
                 if [ ${last_rc} -eq 0 ]; then