diff --git a/bin/cdist-manifest-run-all b/bin/cdist-manifest-run-all
index 884f46ee..fe8263ea 100755
--- a/bin/cdist-manifest-run-all
+++ b/bin/cdist-manifest-run-all
@@ -78,8 +78,12 @@ while [ "$__cdist_new_objects_created" = "y"  ]; do
 
             # Verify no conflicting objects have been created
             while read __cdist_new_object; do
-               grep -q "^$__cdist_new_object\$" "$__cdist_objects_list" && \
-                  __cdist_exit_err "${__cdist_manifest}: Tried to recreate ${__cdist_new_object}"
+               __cdist_object_found=$(grep "^$__cdist_new_object\$" "$__cdist_objects_list" || true)
+
+               if [ "$__cdist_object_found" ]; then
+                  __cdist_object_source="$(cat "$(__cdist_object_dir "$__cdist_new_object")/${__cdist_name_object_source}")"
+                  __cdist_exit_err "${__cdist_manifest}: ${__cdist_new_object} already exists (source: $__cdist_object_source)"
+               fi
             done < "$__cdist_new_objects_list"
 
             # Safe harbour: We can merge all objects into main tree
diff --git a/doc/changelog b/doc/changelog
index 6f7db0bf..4b985c30 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -15,7 +15,6 @@
 	* Bugfix: Remove obsolete $@ call in cdist-remote-explorer-run
 	* Bugfix: Correct manpage for __removeline (broke manpage generation)
 
-
 1.2.0: 2011-03-19
 	* Added dependencies (see cdist-type(7))
 	* New type __removeline (Daniel Roth)