diff --git a/src/buffer.c b/src/buffer.c
index 238af14..34273d8 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1186,7 +1186,10 @@
 		   && !(curwin->w_closing || curwin->w_buffer->b_closing)
 # endif
 		   && (firstwin != lastwin || first_tabpage->tp_next != NULL))
-	    win_close(curwin, FALSE);
+	{
+	    if (win_close(curwin, FALSE) == FAIL)
+		break;
+	}
 #endif
 
 	/*