diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 842e0ff..72ae492 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -539,6 +539,7 @@ Easy-RSA error:
 
 $1
 " 1>&2
+	show_host
 	exit "${2:-1}"
 } # => die()
 
@@ -747,7 +748,6 @@ Temporary session not preserved."
 	# Exit: Final Fail
 	# if 'cleanup' is called without 'ok'
 	# then an error occurred
-	show_host
 	exit 1
 } # => cleanup()