diff --git a/bin/cdist-code-run b/bin/cdist-code-run
index 42b4901d..9528650d 100755
--- a/bin/cdist-code-run
+++ b/bin/cdist-code-run
@@ -23,7 +23,7 @@
 
 . cdist-config
 [ $# -eq 3 ] || __cdist_usage "<object dir> <object> <type>"
-set -ue
+set -uex
 
 # This variable MUST be exactly like this - see __cdist_object_dir
 __cdist_out_object_dir="$1"; shift
@@ -50,7 +50,7 @@ echo "Checking code-${__cdist_gencode_type} for $object ..."
 if [ -f "$require" ]; then
    while read requirement; do
       echo "Requiring  dependency $requirement for $object ..."
-      cdist-remote-code-run "$__cdist_out_object_dir" "$requirement"
+      cdist-code-run "$__cdist_out_object_dir" "$requirement" "$__cdist_gencode_type"
    done < "$require"
 fi