diff --git a/bulk-compiler.sh b/bulk-compiler.sh
index ae83bd2..ad372d9 100755
--- a/bulk-compiler.sh
+++ b/bulk-compiler.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 set -e
+set -o pipefail
 
 test -n "${HTTP_BASIC_USER}"
 test -n "${HTTP_BASIC_PASSWORD}"
@@ -45,10 +46,11 @@ find build/ -type f | grep -v /.keep | nl |
     EXTRA_GEMS="${EXTRA_GEMS}" \
     GEM_COMPILER_FLAGS="${GEM_COMPILER_FLAGS}" \
     /usr/local/bin/bootstrap 2>&1 | tee -a build_log
+    status=$?
 
     echo '```' >> build_log
 
-    if test $? -ne 0 ; then
+    if test $status -ne 0 ; then
       BUILT="${FAILED}"
       echo "not ok ${NUMBER} - ${GEM_NAME} ${GEM_VERSION} build failed"