diff --git a/src/option.c b/src/option.c
index 75ff3cd..60c1141 100644
--- a/src/option.c
+++ b/src/option.c
@@ -112,9 +112,12 @@
 	{
 	    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 b1bccb4..11bfd68 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2116,
+/**/
     2115,
 /**/
     2114,