diff --git a/src/screen.c b/src/screen.c
index abe721e..28fe238 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7467,6 +7467,10 @@
      */
     FOR_ALL_TAB_WINDOWS(tp, wp)
 	win_free_lsize(wp);
+#ifdef FEAT_AUTOCMD
+    if (aucmd_win != NULL)
+	win_free_lsize(aucmd_win);
+#endif
 
     new_ScreenLines = (schar_T *)lalloc((long_u)(
 			      (Rows + 1) * Columns * sizeof(schar_T)), FALSE);
@@ -7504,7 +7508,8 @@
 	}
     }
 #ifdef FEAT_AUTOCMD
-    if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL)
+    if (aucmd_win != NULL && aucmd_win->w_lines == NULL
+					&& win_alloc_lines(aucmd_win) == FAIL)
 	outofmem = TRUE;
 #endif
 #ifdef FEAT_WINDOWS
diff --git a/src/version.c b/src/version.c
index c762648..e16f364 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    243,
+/**/
     242,
 /**/
     241,