diff --git a/src/option.c b/src/option.c
index 4db3027..977d838 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7036,6 +7036,9 @@
     int		i;
     int		j = 0;
 
+    if (wp->w_buffer == NULL)
+	return NULL;  /* buffer was closed */
+
     for (s = wp->w_p_cc; *s != NUL && count < 255;)
     {
 	if (*s == '-' || *s == '+')
diff --git a/src/version.c b/src/version.c
index d0e649c..d67e8d8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    316,
+/**/
     315,
 /**/
     314,