diff --git a/build/build-ar71xx-generic.sh b/build/build-ar71xx-generic.sh
index a112dfacbcbc7ec0755cc0e915d8d56250776af1..2bc5a0922eb8a467b86a05257e54a35ff3655fa2 100644
--- a/build/build-ar71xx-generic.sh
+++ b/build/build-ar71xx-generic.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+#https://stackoverflow.com/questions/2870992/automatic-exit-from-bash-shell-script-on-error
+set -e
+
 GLUON_BRANCH="$1"
 GLUON_VERSION="$2"
 
@@ -17,6 +20,6 @@ mv .git site/
 git clone https://github.com/freifunk-gluon/gluon.git ./gluon -b $GLUON_VERSION
 mv gluon/* ./
 
-make update || exit 1
-make GLUON_TARGET=ar71xx-generic V=s 2>&1 || exit 1 | grep -i "error"
-make manifest GLUON_BRANCH=$GLUON_BRANCH  || exit 1
+make update
+make GLUON_TARGET=ar71xx-generic V=s 2>&1 | grep -i "error"
+make manifest GLUON_BRANCH=$GLUON_BRANCH