diff --git a/src/screen.c b/src/screen.c
index a72bffa..2e425cb 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -801,6 +801,10 @@
     int		row;
     int		j;
 
+    /* Don't do anything if the screen structures are (not yet) valid. */
+    if (!screen_valid(TRUE))
+	return;
+
     if (lnum >= wp->w_topline && lnum < wp->w_botline
 				 && foldedCount(wp, lnum, &win_foldinfo) == 0)
     {
diff --git a/src/version.c b/src/version.c
index eaa3e8e..417a3aa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1834,
+/**/
     1833,
 /**/
     1832,