diff --git a/src/mark.c b/src/mark.c
index 1ac91d8..9c17f7a 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -1374,7 +1374,8 @@
 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 1db6ae9..2d90185 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    59,
+/**/
     58,
 /**/
     57,