diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100755
index 0000000000..d74f612ce0
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# TODO: error checking
+
+(
+  cd bootstrap/bootstrap-mini
+  ./build
+  ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+  java -jar target/bootstrap-mini.jar install
+  ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+)
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+
+BOOTSTRAP_JAR=../bootstrap-mini/target/bootstrap-mini-2.0.1-SNAPSHOT.jar
+
+(
+  cd bootstrap/bootstrap-installer
+  java -jar $BOOTSTRAP_JAR package
+  ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+)
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+
+java -jar bootstrap/bootstrap-installer/target/bootstrap-installer-2.0.1-SNAPSHOT.jar
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+
diff --git a/bootstrap/bootstrap-mini/build b/bootstrap/bootstrap-mini/build
index a2412df6da..ae67ec9143 100755
--- a/bootstrap/bootstrap-mini/build
+++ b/bootstrap/bootstrap-mini/build
@@ -9,5 +9,7 @@ rm -rf ${buildDir} > /dev/null 2>&1
 mkdir -p ${classesDir}
 
 "$JAVA_HOME/bin/javac" -g -d ${classesDir} `find ${srcDir} -name '*.java'`
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
 
 ( cd ${classesDir} ; "$JAVA_HOME/bin/jar" -cfm ../bootstrap-mini.jar ../../src/main/resources/META-INF/MANIFEST.MF * )
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
diff --git a/bootstrap/bootstrap.sh b/bootstrap/bootstrap.sh
deleted file mode 100755
index eff8041ce4..0000000000
--- a/bootstrap/bootstrap.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# TODO: error checking
-
-(
-  cd bootstrap-mini
-  ./build
-  java -jar target/bootstrap-mini.jar install
-)
-
-BOOTSTRAP_JAR=../bootstrap-mini/target/bootstrap-mini-2.0.1-SNAPSHOT.jar
-
-(
-  cd bootstrap-installer
-  java -jar $BOOTSTRAP_JAR package
-)
-
-(
-  cd ..
-  java -jar bootstrap/bootstrap-installer/target/bootstrap-installer-2.0.1-SNAPSHOT.jar
-)
-