2 files changed, 3 insertions, 5 deletions

diff --git a/.buildbot/build.sh b/.buildbot/build.sh
index 394558ff0..f2cdb3f2a 100755
--- a/.buildbot/build.sh
+++ b/.buildbot/build.sh
@@ -1,5 +1,3 @@
 #!/bin/bash
 
-./bootstrap
-./configure --prefix=/tmp/gnunet --enable-experimental
-make
+./bootstrap && ./configure --prefix=/tmp/gnunet --enable-experimental && make
diff --git a/bootstrap b/bootstrap
index b4f5b4dc3..df0e58dda 100755
--- a/bootstrap
+++ b/bootstrap
@@ -79,8 +79,8 @@ check_libtool()
        existence libtoolize || \
        existence glibtoolize || \
        existence slibtool; then
-        autoreconf -if
-        . "bin/pogen.sh"
+        autoreconf -if || exit 1
+        . "bin/pogen.sh" || exit 1
     else
         echo "*** No libtoolize (libtool) or libtool found, please install it ***" >&2;
         exit 1