diff --git a/src/version.c b/src/version.c
index 226a05eedd..1f66cef8ad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    812,
 /**/
     811,
 /**/
diff --git a/src/window.c b/src/window.c
index 5a8dc2e9e6..7c8f4fb366 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7934,7 +7934,7 @@ check_colorcolumn(
     char_u *cc,		// when NULL: use "wp->w_p_cc"
     win_T *wp)		// when NULL: only parse "cc"
 {
-    char_u	*s;
+    char_u	*s = empty_option;
     int		tw;
     int		col;
     int		count = 0;
@@ -7947,7 +7947,7 @@ check_colorcolumn(
 
     if (cc != NULL)
 	s = cc;
-    else
+    else if (wp != NULL)
 	s = wp->w_p_cc;
 
     if (wp != NULL)