diff --git a/src/version.c b/src/version.c
index 3c12b2f..4e5e1a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    99,
+/**/
     98,
 /**/
     97,
diff --git a/src/window.c b/src/window.c
index 7ac1da8..b3a7f9e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -986,7 +986,8 @@
 
     /* Set w_fraction now so that the cursor keeps the same relative
      * vertical position. */
-    set_fraction(oldwin);
+    if (oldwin->w_height > 0)
+	set_fraction(oldwin);
     wp->w_fraction = oldwin->w_fraction;
 
 #ifdef FEAT_VERTSPLIT