diff --git a/bin/cdist-object-codegen b/bin/cdist-object-codegen
index 52006255..59d73674 100755
--- a/bin/cdist-object-codegen
+++ b/bin/cdist-object-codegen
@@ -54,5 +54,5 @@ if [ -x "$gencode" ]; then
 
 eof
 
-   __cdist_exec_fail_on_error "$gencode"
+   __cdist_exec_fail_on_error "$gencode" "$__cdist_object_id"
 fi
diff --git a/doc/dev/todo/post-1.0 b/doc/dev/todo/post-1.0
index 25867498..b61ccde1 100644
--- a/doc/dev/todo/post-1.0
+++ b/doc/dev/todo/post-1.0
@@ -2,6 +2,9 @@ Core:
    - Support singletons (see types/issue for a good reason)
    - extend cdist_tree_wrapper to look for optional/mandority parameters for types
       - gives "good" database, which contains only valid objects
+   - use ssh with master socket?
+      - saves connection delay for new connections: -M
+      - hint: http://protempore.net/~calvins/howto/ssh-connection-sharing/
 
 Type handler:
    - add dependency parameters to core available for every type
@@ -22,3 +25,4 @@ Types to be written:
       - add_line_to_file_if_not_existing
       - delete_line_from_file
       - regexp replace (can probably cover all?)
+