diff --git a/src/optionstr.c b/src/optionstr.c
index af4b749f2..1cf1ee9df 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -500,7 +500,7 @@ set_string_option(
     if (is_hidden_option(opt_idx))	// don't set hidden option
 	return NULL;
 
-    s = vim_strsave(value);
+    s = vim_strsave(value == NULL ? (char_u *)"" : value);
     if (s != NULL)
     {
 	varp = (char_u **)get_option_varp_scope(opt_idx,
diff --git a/src/version.c b/src/version.c
index b0497a52c..717ca669e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    394,
 /**/
     393,
 /**/