diff --git a/src/option.c b/src/option.c
index 75ff3cdb29..60c1141b6a 100644
--- a/src/option.c
+++ b/src/option.c
@@ -112,9 +112,12 @@ set_init_1(int clean_arg)
 	{
 	    len = STRLEN(p) + 3;  // two quotes and a trailing NUL
 	    cmd = alloc(len);
-	    vim_snprintf((char *)cmd, len, "\"%s\"", p);
-	    set_string_default("sh", cmd);
-	    vim_free(cmd);
+	    if (cmd != NULL)
+	    {
+		vim_snprintf((char *)cmd, len, "\"%s\"", p);
+		set_string_default("sh", cmd);
+		vim_free(cmd);
+	    }
 	}
 	else
 	    set_string_default("sh", p);
diff --git a/src/version.c b/src/version.c
index b1bccb4f6b..11bfd68446 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2116,
 /**/
     2115,
 /**/