diff --git a/src/win/win.c b/src/win/win.c
index d2a5003ec..650e43ba8 100644
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -249,28 +249,28 @@ has_language_changed(uint32_t id)
 void
 set_language(uint32_t id)
 {
-	if (id == 0xFFFF)
-	{
-		set_language(lang_sys);
-		lang_id = id;
-		return;
-	}
-	
+    if (id == 0xFFFF) {
+	set_language(lang_sys);
+	lang_id = id;
+	return;
+    }
+
     if (lang_id != id) {
-		/* Set our new language ID. */
-		lang_id = id;
-		SetThreadUILanguage(lang_id);
+	/* Set our new language ID. */
+	lang_id = id;
+	SetThreadUILanguage(lang_id);
 		
-		/* Load the strings table for this ID. */
-		LoadCommonStrings();
+	/* Load the strings table for this ID. */
+	LoadCommonStrings();
 		
-		/* Reload main menu */
-		menuMain = LoadMenu(hinstance, L"MainMenu");
+	/* Reload main menu */
+	menuMain = LoadMenu(hinstance, L"MainMenu");
+	if (hwndMain != NULL)
 		SetMenu(hwndMain, menuMain);
-		
-		/* Re-init all the menus */
-		ResetAllMenus();
-		media_menu_init();
+
+	/* Re-init all the menus */
+	ResetAllMenus();
+	media_menu_init();
     } 
 }
 
diff --git a/src/win/win_ui.c b/src/win/win_ui.c
index b6a22fe50..703e3e414 100644
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -54,8 +54,8 @@
 
 
 /* Platform Public data, specific. */
-HWND		hwndMain,		/* application main window */
-		hwndRender;		/* machine render window */
+HWND		hwndMain = NULL,	/* application main window */
+		hwndRender = NULL;	/* machine render window */
 HMENU		menuMain;		/* application main menu */
 RECT		oldclip;		/* mouse rect */
 int		sbar_height = 23;	/* statusbar height */