diff --git a/scripts/bgit b/scripts/bgit
index d1ce0150..f11ac4a0 100755
--- a/scripts/bgit
+++ b/scripts/bgit
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Error handling
+set -e
+set -u
+
 # For styling/colorizing output
 txtbld=$(tput bold)
 txtblue=${txtbld}$(tput setaf 4)