diff --git a/src/end.c b/src/end.c
index 29ccd006a..020f35b0d 100644
--- a/src/end.c
+++ b/src/end.c
@@ -738,7 +738,8 @@ die:
 	    if(!done_stopprint || flags.tombstone)
 		endwin = create_nhwindow(NHW_TEXT);
 
-	    if(how < GENOCIDED && flags.tombstone) outrip(endwin, how);
+	    if (how < GENOCIDED && flags.tombstone && endwin != WIN_ERR)
+		outrip(endwin, how);
 	} else
 	    done_stopprint = 1; /* just avoid any more output */