diff --git a/scripts/remove b/scripts/remove
index 36d6637..33c094a 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,7 +1,9 @@
 #!/bin/bash
 
+# Exit on command errors and treat unset variables as an error
+set -u
+
 # Source app helpers
-source _common.sh
 source /usr/share/yunohost/helpers
 
 app=$YNH_APP_INSTANCE_NAME