diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 5a0559c..7fa85fa 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -230,7 +230,7 @@ die() {
 Easy-RSA error:
 
 $1" 1>&2
-	exit "${2:-1}"
+	prog_exit "${2:-1}"
 } # => die()
 
 # non-fatal warning output
@@ -1319,7 +1319,7 @@ done
 vars_setup
 
 # Register clean_temp and prog_exit on SIGHUP, SIGINT, SIGQUIT, and SIGABRT
-trap "clean_temp; prog_exit" 1 2 3 6
+trap "clean_temp; prog_exit" 0 1 2 3 6
 
 # determine how we were called, then hand off to the function responsible
 cmd="$1"