diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 82664a082..bda88ab92 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20101109
+--------
+main/multi.c: In multi_consistency_error check for Game_wind before trying to set it in/visible - just for safety
+
 20101101
 --------
 main/newmenu.c: In case listbox strings are too long for screen, fit box width to screen width, shorten strings and add a scroll effect to selected item
diff --git a/main/multi.c b/main/multi.c
index 20d73dea3..f139dd6d8 100644
--- a/main/multi.c
+++ b/main/multi.c
@@ -2667,9 +2667,11 @@ void multi_consistency_error(int reset)
 	if (++count < 10)
 		return;
 
-	window_set_visible(Game_wind, 0);
+	if (Game_wind)
+		window_set_visible(Game_wind, 0);
 	nm_messagebox(NULL, 1, TXT_OK, TXT_CONSISTENCY_ERROR);
-	window_set_visible(Game_wind, 1);
+	if (Game_wind)
+		window_set_visible(Game_wind, 1);
 	count = 0;
 	multi_quit_game = 1;
 	game_leave_menus();