diff --git a/src/gui.c b/src/gui.c
index b961108ed8..9291366e12 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -2753,9 +2753,15 @@ gui_redraw_block(
 	}
 	else if (enc_utf8)
 	{
-	    // FIXME: how can the first character ever be zero?
-	    if (col1 > 0 && ScreenLines[off + col1] == 0)
-		--col1;
+	    if (ScreenLines[off + col1] == 0)
+	    {
+		if (col1 > 0)
+		    --col1;
+		else
+		    // FIXME: how can the first character ever be zero?
+		    IEMSGN("INTERNAL ERROR: NUL in ScreenLines in row %ld",
+								      gui.row);
+	    }
 # ifdef FEAT_GUI_GTK
 	    if (col2 + 1 < Columns && ScreenLines[off + col2 + 1] == 0)
 		++col2;
diff --git a/src/version.c b/src/version.c
index b912a6eec8..c4d9a8f150 100644
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    567,
 /**/
     566,
 /**/