diff --git a/src/window.c b/src/window.c
index f77ede3..55ce31c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2682,6 +2682,8 @@
 	    reset_VIsual_and_resel();	// stop Visual mode
 
 	    other_buffer = TRUE;
+	    if (!win_valid(win))
+		return FAIL;
 	    win->w_closing = TRUE;
 	    apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf);
 	    if (!win_valid(win))