diff --git a/HACKERS_README b/HACKERS_README
index 6f27335a..7685ac35 100755
--- a/HACKERS_README
+++ b/HACKERS_README
@@ -13,7 +13,10 @@ Do not believe anything written in cdist, besides what's written in this file
 
 What you can do so far: (executed from top level directory)
 
-The following code will get executed if you run this README:
+The following code will get executed if you run this README,
+I usually do it like this:
+
+   % rm -rf /tmp/localhost && ./HACKERS_README
 
 eof
 
diff --git a/bin/cdist-object-codegen b/bin/cdist-object-codegen
index 86bdb7c3..81357524 100755
--- a/bin/cdist-object-codegen
+++ b/bin/cdist-object-codegen
@@ -24,7 +24,7 @@
 
 . cdist-config
 [ $# -eq 3 ] || __cdist_usage "<target host>" "<object_base_dir>" "<object>"
-set -u
+set -eu
 
 export __cdist_target_host="$1"; shift
 export __cdist_object_base_dir="$1"; shift
@@ -54,6 +54,8 @@ if [ -x "$gencode" ]; then
 
 eof
 
+   # Catch errors ourself now
+   set +e
    "$gencode"; ret=$?
 
 else