diff --git a/scripts/remove b/scripts/remove
index 9a5dc51..963a84d 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Exit on command errors and treat unset variables as an error
+set -u
+
 # See comments in install script
 app=$YNH_APP_INSTANCE_NAME