diff --git a/utils/genheader.sh b/utils/genheader.sh
index 7c9bba0f..71766634 100644
--- a/utils/genheader.sh
+++ b/utils/genheader.sh
@@ -7,8 +7,9 @@ fi
 
 set -ex
 
-test $# = 1
-test ! -e $1
-mkdir $1
-cd $1
+# for some reason on sourced script set -e doesn't work
+test $# = 1 || exit 1
+test ! -e "$1"
+mkdir "$1"
+cd "$1"