diff --git a/src/mark.c b/src/mark.c
index 1ac91d8b1b7ed64a30c2d2936c4522946118cae7..9c17f7afb717898855a3c70e645e839dbfb60f8e 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -1374,7 +1374,8 @@ free_jumplist(wp)
 set_last_cursor(win)
     win_T	*win;
 {
-    win->w_buffer->b_last_cursor = win->w_cursor;
+    if (win->w_buffer != NULL)
+	win->w_buffer->b_last_cursor = win->w_cursor;
 }
 
 #if defined(EXITFREE) || defined(PROTO)
diff --git a/src/version.c b/src/version.c
index 1db6ae92d610bd06022e1d936a27c9b72cd77743..2d90185b711735fec28eeca914a61816c1d89414 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    59,
 /**/
     58,
 /**/