diff --git a/src/version.c b/src/version.c
index 6c113c7..a71784f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    317,
+/**/
     316,
 /**/
     315,
diff --git a/src/window.c b/src/window.c
index 856e7c4..fe6f335 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4721,8 +4721,12 @@
 win_free_lsize(wp)
     win_T	*wp;
 {
-    vim_free(wp->w_lines);
-    wp->w_lines = NULL;
+    /* TODO: why would wp be NULL here? */
+    if (wp != NULL)
+    {
+	vim_free(wp->w_lines);
+	wp->w_lines = NULL;
+    }
 }
 
 /*