diff --git a/bin/cdist-manifest-run b/bin/cdist-manifest-run
index 4bdbde79..6789b9ec 100755
--- a/bin/cdist-manifest-run
+++ b/bin/cdist-manifest-run
@@ -46,4 +46,11 @@ if [ ! -x "${__cdist_manifest}" ]; then
 fi
 
 mkdir -p "${__cdist_output_dir}"
-"${__cdist_manifest}"
+
+set +e
+
+"${__cdist_manifest}"; ret=$?
+
+if [ "$ret" -ne 0 ]; then
+   __cdist_exit_err "Error: ${__cdist_manifest} exited non-zero."
+fi