diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 25be518e7..da9ef78a9 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20110526
+--------
+arch/sdl/event.c: In event_process() if a window closes while being drawn and there isn't a previous window we can get the next from just finish processing for this frame
+
 20110525
 --------
 main/multi.c, main/multi.h, main/net_ipx.h, main/net_udp.c: Added multi_send_data_direct to send multibuf to a specific player (i.e. Host<->Client, not Client<->Client); Overhauled kill sending/receiving and computation to rely in host information about game_mode-related variables (team_vector, Bounty_target) which are vital for consistent kill computation; Added function to send/update game_mode-related variables and solve /move command with this as well instead of workaround via updating lite_info
diff --git a/arch/sdl/event.c b/arch/sdl/event.c
index 70506b6c0..cb0977962 100644
--- a/arch/sdl/event.c
+++ b/arch/sdl/event.c
@@ -159,7 +159,11 @@ void event_process(void)
 		if (window_is_visible(wind))
 			window_send_event(wind, &event);
 		if (!window_exists(wind))
-			wind = window_get_next(prev); // the current window seemed to be closed. so take the next one from the previous which should be able to point to the one after the currently closed
+		{
+			if (!prev) // well there isn't a previous window ...
+				break; // ... just bail out - we've done everything for this frame we can.
+			wind = window_get_next(prev); // the current window seemed to be closed. so take the next one from the previous which should be able to point to the one after the current closed
+		}
 		else
 			wind = window_get_next(wind);
 	}