diff --git a/install/airtime-uninstall b/install/airtime-uninstall
index b65700d00..6bfb48c21 100755
--- a/install/airtime-uninstall
+++ b/install/airtime-uninstall
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+#Cause bash script to exit if any of the installers
+#return with a non-zero return value.
+set -e
+
 # Absolute path to this script
 SCRIPT=`readlink -f $0`
 # Absolute directory this script is in
diff --git a/python_apps/create-pypo-user.py b/python_apps/create-pypo-user.py
index 38619a0f3..46a7bb1b9 100644
--- a/python_apps/create-pypo-user.py
+++ b/python_apps/create-pypo-user.py
@@ -1,4 +1,5 @@
 import os
+import sys
 from subprocess import Popen, PIPE, STDOUT
 
 def create_user(username):
diff --git a/python_apps/remove-pypo-user.py b/python_apps/remove-pypo-user.py
index 278d6f783..4e29e78e5 100644
--- a/python_apps/remove-pypo-user.py
+++ b/python_apps/remove-pypo-user.py
@@ -1,4 +1,5 @@
 import os
+import sys
 import time
 
 def remove_user(username):