diff --git a/distro/windows/bin/easyrsa-shell-init.sh b/distro/windows/bin/easyrsa-shell-init.sh
index a3559bb2a..7e543b00f 100644
--- a/distro/windows/bin/easyrsa-shell-init.sh
+++ b/distro/windows/bin/easyrsa-shell-init.sh
@@ -65,7 +65,7 @@ Please try using one of the following solutions:
 
 These will start EasyRSA in your user's 'home directory/easy-rsa'
 
-Press enter to exit."
+Press enter to exit.
 ACCESS_DENIED_MSG
 
 	#shellcheck disable=SC2162
diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 8157aaa08..9611cb202 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -807,13 +807,15 @@ easyrsa_mkdir_p() {
 	if [ -d "$1" ]; then
 		: # ok
 	else
-		mkdir "$1" || die "(1) easyrsa_mkdir_p: $1"
+		mkdir "$1"
+		[ -d "$1" ] || die "(1) easyrsa_mkdir_p: $1"
 	fi
 
 	if [ -d "$1/$2" ]; then
 		return 0 # Exists ok
 	else
-		mkdir "$1/$2" && return 0 # Exists now
+		mkdir "$1/$2"
+		[ -d "$1/$2" ] && return 0 # Exists now
 	fi
 	die "(2) easyrsa_mkdir_p: $1/$2"
 } # => easyrsa_mkdir_p()