diff --git a/patches/systemvm/debian/buildsystemvm.sh b/patches/systemvm/debian/buildsystemvm.sh
index 66b03f3f600..07eaacf9cf5 100755
--- a/patches/systemvm/debian/buildsystemvm.sh
+++ b/patches/systemvm/debian/buildsystemvm.sh
@@ -22,6 +22,8 @@
 
 
 set -x
+set -u
+set -e
 
 IMAGENAME=systemvm
 LOCATION=/var/lib/images/systemvm