diff --git a/src/buffer.c b/src/buffer.c
index d4a9c1eeb1..5b2ec6871f 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -567,8 +567,9 @@ buf_freeall(buf, flags)
     diff_buf_delete(buf);	    /* Can't use 'diff' for unloaded buffer. */
 #endif
 #ifdef FEAT_SYN_HL
-    if (curwin->w_buffer == buf)
-	reset_synblock(curwin);	    /* remove any ownsyntax */
+    /* Remove any ownsyntax, unless exiting. */
+    if (firstwin != NULL && curwin->w_buffer == buf)
+	reset_synblock(curwin);
 #endif
 
 #ifdef FEAT_FOLDING
diff --git a/src/version.c b/src/version.c
index 1eadaec242..35b519885a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    361,
 /**/
     360,
 /**/