diff --git a/tools/build/onos-build b/tools/build/onos-build
index dc2443d..b9c752e 100755
--- a/tools/build/onos-build
+++ b/tools/build/onos-build
@@ -3,6 +3,8 @@
 # Builds the ONOS from source.
 # -----------------------------------------------------------------------------
 
+set -e
+
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
diff --git a/tools/build/onos-build-docs b/tools/build/onos-build-docs
index 10feacc..93a73c1 100755
--- a/tools/build/onos-build-docs
+++ b/tools/build/onos-build-docs
@@ -3,6 +3,8 @@
 # Builds the ONOS Java API docs.
 # -----------------------------------------------------------------------------
 
+set -e
+
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
diff --git a/tools/build/onos-change-version b/tools/build/onos-change-version
index 9d3c74a..2782b5c 100755
--- a/tools/build/onos-change-version
+++ b/tools/build/onos-change-version
@@ -3,6 +3,8 @@
 # Changes ONOS version in POM files, and other release artifacts.
 # -----------------------------------------------------------------------------
 
+set -e
+
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
diff --git a/tools/build/onos-package b/tools/build/onos-package
index 269f959..8f6127d 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -3,6 +3,8 @@
 # Packages ONOS distributable into onos.tar.gz, onos.zip or a deb file
 # -----------------------------------------------------------------------------
 
+set -e
+
 # Build the staging directory used to produce the packages
 function build_stage_dir() {
     # Make sure we have the original apache karaf bits first
diff --git a/tools/build/onos-package-test b/tools/build/onos-package-test
index 38a4877..6328bb8 100755
--- a/tools/build/onos-package-test
+++ b/tools/build/onos-package-test
@@ -3,6 +3,8 @@
 # Packages ONOS test facilities into onos-test.tar.gz
 # -----------------------------------------------------------------------------
 
+set -e
+
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
diff --git a/tools/build/onos-snapshot b/tools/build/onos-snapshot
index 10da019..e482df9 100755
--- a/tools/build/onos-snapshot
+++ b/tools/build/onos-snapshot
@@ -3,6 +3,8 @@
 # Drives the ONOS snapshot process.
 # -----------------------------------------------------------------------------
 
+set -e
+
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
diff --git a/tools/build/onos-test b/tools/build/onos-test
index 4ccb85e..c681961 100755
--- a/tools/build/onos-test
+++ b/tools/build/onos-test
@@ -3,6 +3,8 @@
 # Launches the ONOS tests on the current cell environment.
 # -----------------------------------------------------------------------------
 
+set -e
+
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
diff --git a/tools/build/onos-upload-bits b/tools/build/onos-upload-bits
index e0d5524..e3bb83c 100755
--- a/tools/build/onos-upload-bits
+++ b/tools/build/onos-upload-bits
@@ -2,6 +2,9 @@
 # -----------------------------------------------------------------------------
 # Uploads ONOS distributable bits.
 # -----------------------------------------------------------------------------
+
+set -e
+
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
diff --git a/tools/build/onos-upload-docs b/tools/build/onos-upload-docs
index 550895e..f74a13f 100755
--- a/tools/build/onos-upload-docs
+++ b/tools/build/onos-upload-docs
@@ -3,6 +3,8 @@
 # Uploads ONOS Java API docs.
 # -----------------------------------------------------------------------------
 
+set -e
+
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults