diff --git a/create-attributable-archive.sh b/create-attributable-archive.sh
index d86f499..0558b86 100755
--- a/create-attributable-archive.sh
+++ b/create-attributable-archive.sh
@@ -177,6 +177,18 @@ audit_passphrase() {
     fi
 }
 
+exit_cleanup() {
+    reset
+
+    for var in $(compgen -v); do
+        printf "unsetting $var"
+        unset "$var"
+        checkcode $?
+    done
+}
+
+trap exit_cleanup EXIT
+
 printf "setting up environment..."
 reset
 
@@ -318,7 +330,4 @@ printf "unsetting keystore passphrase..."
 unset keystore_passphrase > /dev/null 2>&1
 checkcode $?
 
-printf "resetting environment..."
-reset
-
 echo -e "\033[0;32mdone :3\033[0m"