diff --git a/bootstrap-debian.sh b/bootstrap-debian.sh
index 001116b..3f54aa7 100644
--- a/bootstrap-debian.sh
+++ b/bootstrap-debian.sh
@@ -2,6 +2,9 @@
 #
 # Script to bootstrap a basic OpenNMS setup
 
+set -eEuo pipefail
+trap 's=$?; echo >&2 "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
+
 # Default build identifier set to stable
 DEBIAN_FRONTEND=noninteractive
 ERROR_LOG="bootstrap.log"
diff --git a/bootstrap-yum.sh b/bootstrap-yum.sh
index 4729bb7..dd855d7 100644
--- a/bootstrap-yum.sh
+++ b/bootstrap-yum.sh
@@ -2,6 +2,9 @@
 #
 # Script to bootstrap a basic OpenNMS setup
 
+set -eEuo pipefail
+trap 's=$?; echo >&2 "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
+
 # Default build identifier set to stable
 ERROR_LOG="bootstrap.log"
 POSTGRES_USER="postgres"