diff --git a/bin/cdist-object-run b/bin/cdist-object-run
index 450ba361..e3fc1629 100755
--- a/bin/cdist-object-run
+++ b/bin/cdist-object-run
@@ -33,6 +33,9 @@ set -eu
 
 __cdist_target_host="$1"; shift
 __cdist_object="$1"; shift
+__cdist_object_dir="$(__cdist_object_dir "$__cdist_object")"
+[ -d "$__cdist_object_dir" ] || __cdist_exit_err "Requested object is not defined: $__cdist_object"
+
 # Export to non-core for use in manifest and gencode scripts
 export $__cdist_name_var_self=$__cdist_object