diff --git a/src/syntax.c b/src/syntax.c
index 6bbe4baccf..ccdb2030cc 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -5764,6 +5764,8 @@ syn_cmd_sync(exarg_T *eap, int syncing UNUSED)
 	next_arg = skipwhite(arg_end);
 	vim_free(key);
 	key = vim_strnsave_up(arg_start, arg_end - arg_start);
+	if (key == NULL)
+	    break;
 	if (STRCMP(key, "CCOMMENT") == 0)
 	{
 	    if (!eap->skip)
diff --git a/src/version.c b/src/version.c
index 73d4560014..c13f7f18f9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1171,
 /**/
     1170,
 /**/