diff --git a/src/term.c b/src/term.c
index 51698fb..226bdee 100644
--- a/src/term.c
+++ b/src/term.c
@@ -5231,6 +5231,13 @@
 	    else
 		key_name[1] = get_pseudo_mouse_code(current_button,
 							   is_click, is_drag);
+
+	    /* Make sure the mouse position is valid.  Some terminals may
+	     * return weird values. */
+	    if (mouse_col >= Columns)
+		mouse_col = Columns - 1;
+	    if (mouse_row >= Rows)
+		mouse_row = Rows - 1;
 	}
 #endif /* FEAT_MOUSE */
 
diff --git a/src/version.c b/src/version.c
index dafc391..9f0cfbf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    936,
+/**/
     935,
 /**/
     934,
diff --git a/src/window.c b/src/window.c
index e8134e0..010d7ae 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5785,6 +5785,8 @@
 	offset = room;		/* Move as far as we can */
     if (offset <= 0)		/* No room at all, quit. */
 	return;
+    if (fr == NULL)
+	return;			/* Safety check, should not happen. */
 
     /* grow frame fr by offset lines */
     frame_new_width(fr, fr->fr_width + offset, left, FALSE);