diff --git a/core/__cdist_code_run b/core/__cdist_code_run
index ca73b02d..eced45af 100755
--- a/core/__cdist_code_run
+++ b/core/__cdist_code_run
@@ -40,7 +40,7 @@ __cdist_code_run()
       if [ -f "$__cdist_code" ]; then
          if [ -x "$__cdist_code" ]; then
             __cdist_echo info "Executing code-${__cdist_code_type}"
-            __cdist_exec_fail_on_error "$__cdist_code"
+            __cdist_run_shell "$__cdist_code"
          else
             __cdist_exit_err "$__cdist_code exists, but is not executable."
          fi
diff --git a/core/__cdist_manifest_run b/core/__cdist_manifest_run
index aa8c56e3..8bf9cc51 100755
--- a/core/__cdist_manifest_run
+++ b/core/__cdist_manifest_run
@@ -53,5 +53,5 @@ __cdist_manifest_run()
    # prepend our path, so all cdist tools come before other tools
    export PATH="${__cdist_out_type_bin_dir}:$PATH"
 
-   __cdist_exec_fail_on_error "${__cdist_manifest}"
+   __cdist_run_shell "${__cdist_manifest}"
 }
diff --git a/core/__cdist_object_gencode b/core/__cdist_object_gencode
index 1024f2c5..08ef8b7d 100755
--- a/core/__cdist_object_gencode
+++ b/core/__cdist_object_gencode
@@ -43,7 +43,7 @@ __cdist_object_gencode()
    export __global="$__cdist_out_dir"
 
    if [ -x "$__cdist_type_gencode" ]; then
-      __cdist_exec_fail_on_error "$__cdist_type_gencode" > "$__cdist_tmp_file"
+      __cdist_run_shell "$__cdist_type_gencode" > "$__cdist_tmp_file"
    else
       if [ -e "$__cdist_type_gencode" ]; then
          __cdist_exit_err "$__cdist_type_gencode exists, but is not executable"