diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 00fc0cd..33cd339 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -254,6 +254,7 @@ die() {
 Easy-RSA error:
 
 $1" 1>&2
+	clean_temp;
 	prog_exit "${2:-1}"
 } # => die()
 
@@ -1622,7 +1623,7 @@ done
 vars_setup
 
 # Register clean_temp and prog_exit on SIGHUP, SIGINT, SIGQUIT, and SIGABRT
-trap "clean_temp; prog_exit 1" 1
+trap "clean_temp; prog_exit 1" 1 ERR
 trap "clean_temp; prog_exit 2" 2
 trap "clean_temp; prog_exit 3" 3
 trap "clean_temp; prog_exit 6" 6