diff --git a/bin/cdist-config b/bin/cdist-config
index 62337024..56c49772 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -227,7 +227,8 @@ __cdist_object_id_from_object()
 
 __cdist_object_dir()
 {
-   echo "${__cdist_out_object_dir}/$1"
+   __cdist_object_dir="${__cdist_out_object_dir}/$1"
+   echo "$__cdist_object_dir"
 }
 
 __cdist_remote_object_dir()
diff --git a/bin/cdist-remote-code-run b/bin/cdist-remote-code-run
index 2db9d0e7..af362470 100755
--- a/bin/cdist-remote-code-run
+++ b/bin/cdist-remote-code-run
@@ -30,6 +30,11 @@ __cdist_out_object_dir="$1"; shift
 
 object="$1"; shift
 
+if [ ! -d "$(__cdist_object_dir "$object")" ]; then
+   __cdist_exit_err "Object $object missing."
+fi  
+
+
 finished="$(__cdist_object_code_finished "$object")"
 code="$(__cdist_object_code "$object")"
 require="$(__cdist_object_require "$object")"