diff --git a/bin/cdist-explorer-run b/bin/cdist-explorer-run
index bf738355..fcbe2518 100755
--- a/bin/cdist-explorer-run
+++ b/bin/cdist-explorer-run
@@ -23,16 +23,12 @@
 #
 
 . cdist-config
-
-if [ $# -ne 2 ]; then
-   __cdist_usage "<target host> <outdir>"
-fi
+[ $# -eq 2 ] || __cdist_usage "<target host> <outdir>"
+set -ue
 
 export __cdist_target_host="$1"; shift
 export __cdist_output_dir="$1"; shift
 
-set -e
-
 # create basedir
 ssh root@${__cdist_target_host} "mkdir -p \"${__cdist_remote_base_dir}\" \
          \"${__cdist_remote_cache_dir}\" \"${__cdist_remote_cache_bin}\" \