diff --git a/install.sh b/install.sh
index 6af51f29..bd4127f3 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-cd "$(dirname "$0")" || exit 1
+set -e
+
+cd "$(dirname "$0")"
 source "lib/options.sh"
 source "lib/installer.sh"
 
@@ -12,8 +14,6 @@ fi
 
 if [[ -z "${INSTALLED[*]}" ]]; then
 
-    set -e
-
     echo "* creating dkms.conf"
     sed 's/"@DO_NOT_CHANGE@"/"'"${VERSION}"'"/g' <hid-xpadneo/dkms.conf.in >hid-xpadneo/dkms.conf
 
diff --git a/uninstall.sh b/uninstall.sh
index 2910235f..8d3d62ac 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-cd "$(dirname "$0")" || exit 1
+set -e
+
+cd "$(dirname "$0")"
 source "lib/options.sh"
 source "lib/installer.sh"
 
@@ -10,8 +12,7 @@ modprobe -r hid_xpadneo || true
 echo "* looking for registered instances"
 echo "found ${#INSTALLED[@]} registered instance(s) on your system"
 
-set -e
-
+# NOTE: overrides VERSION from lib/installer.sh but we don't need it
 for VERSION in "${INSTALLED[@]}"; do
     echo "* ${VERSION}"
 
diff --git a/update.sh b/update.sh
index 7e613789..067e24bc 100755
--- a/update.sh
+++ b/update.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-cd "$(dirname "$0")" || exit 1
+set -e
+
+cd "$(dirname "$0")"
 source "lib/installer.sh"
 
 LATEST=$(get_upstream_version_latest)