diff --git a/bin/cdist-manifest-run b/bin/cdist-manifest-run
index 44cf0741..a24144b8 100755
--- a/bin/cdist-manifest-run
+++ b/bin/cdist-manifest-run
@@ -23,8 +23,8 @@
 #
 
 . cdist-config
-[ $# -ge 3 ] || __cdist_usage "<target host> <manifest> <out dir> [manifest arguments]"
-set -ux
+[ $# -eq 3 ] || __cdist_usage "<target host> <manifest> <out dir>"
+set -u
 
 __cdist_target_host="$1"; shift
 __cdist_manifest="$1"; shift