diff --git a/bin/cdist_tree_wrapper b/bin/cdist_tree_wrapper
index 238ef6b4..64229efe 100755
--- a/bin/cdist_tree_wrapper
+++ b/bin/cdist_tree_wrapper
@@ -39,6 +39,9 @@ echo "$__cdist_object_id" | grep -q "^${__cdist_sane_regexp}\$" || \
 __cdist_object="${__cdist_type}/${__cdist_object_id}"
 __cdist_ddir="$__cdist_output_dir/${__cdist_object}"
 
+# Append id for error messages
+__cdist_myname="$__cdist_myname ($__cdist_object_id)"
+
 if [ -e "${__cdist_ddir}" ]; then
    source="$(__cdist_object_source "${__cdist_ddir}")"
    __cdist_exit_err "${__cdist_object} already exists (source: $source)"
@@ -46,8 +49,6 @@ fi
 
 mkdir -p "${__cdist_ddir}"
 
-echo "I am $__cdist_myname and have been called with $@"
-
 # Record (correct ;-) source
 echo "${__cdist_manifest}" > "${__cdist_ddir}/${__cdist_name_object_source}"