diff --git a/bin/cdist-config b/bin/cdist-config
index 56f62144..6feaa767 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -163,9 +163,11 @@ __cdist_echo()
 
    case "$__cdist_echo_type" in
       debug)
+         set +u
          if [ "$__cdist_debug" ]; then
             echo $__cdist_echo_prefix "Debug: $@"
          fi
+         set -u
       ;;
       info)
          echo $__cdist_echo_prefix "$@"