diff --git a/bin/cdist_tree_wrapper b/bin/cdist_tree_wrapper
index d7a2af6c..69835716 100755
--- a/bin/cdist_tree_wrapper
+++ b/bin/cdist_tree_wrapper
@@ -28,6 +28,8 @@
 
 [ $# -ge 1 ] || __cdist_usage "<id> <options>"
 
+set -eu
+
 echo "I am $__cdist_myname and have been called with $@"
 
 __cdist_id="$1"; shift