diff --git a/ChangeLog b/ChangeLog
index 7e38b4cd7..a727aa869 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Easy-RSA 3 ChangeLog
 
 3.2.4 (TBD)
 
+   * set_no_clobber(): Add simple error detection (0f93880) (#1379)
    * revoke: Archive request and private key files and expand help (79754da) (#1378)
      Original bug report: github-user spacefreak86 (#1377)
    * Remove 'easyrsa_mkdir()', use only 'mkdir' (5738f3d) (#1376)
diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 9f11de320..e362ee27c 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -836,21 +836,22 @@ set_no_clobber() {
 	case "$1" in
 		on)
 			if [ "$easyrsa_host_os" = win ]; then
-				set -o noclobber
+				set -o noclobber && return
 			else
-				set -C
+				set -C && return
 			fi
 		;;
 		off)
 			if [ "$easyrsa_host_os" = win ]; then
-				set +o noclobber
+				set +o noclobber && return
 			else
-				set +C
+				set +C && return
 			fi
 		;;
 		*)
-			die "set_no_clobber - input"
+			: # drop to error
 	esac
+	die "set_no_clobber() $1, Failed"
 } # => set_no_clobber()
 
 # Create lock-file