diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index 0dc7763819..8b2b539a32 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -1033,10 +1033,17 @@ function onGameAttributesChange()
 		var mapSelectionBox = Engine.GetGUIObjectByName("mapSelection");
 		mapSelectionBox.selected = mapSelectionBox.list_data.indexOf(mapName);
 		Engine.GetGUIObjectByName("mapSelectionText").caption = translate(getMapDisplayName(mapName));
-		var populationCapBox = Engine.GetGUIObjectByName("populationCap");
-		populationCapBox.selected = populationCapBox.list_data.indexOf(mapSettings.PopulationCap);
-		var startingResourcesBox = Engine.GetGUIObjectByName("startingResources");
-		startingResourcesBox.selected = startingResourcesBox.list_data.indexOf(mapSettings.StartingResources);
+		if (mapSettings.PopulationCap)
+		{
+			var populationCapBox = Engine.GetGUIObjectByName("populationCap");
+			populationCapBox.selected = populationCapBox.list_data.indexOf(mapSettings.PopulationCap);
+		}		
+		if (mapSettings.StartingResources)
+		{
+			var startingResourcesBox = Engine.GetGUIObjectByName("startingResources");
+			startingResourcesBox.selected = startingResourcesBox.list_data.indexOf(mapSettings.StartingResources);
+		}
+
 		initMapNameList();
 	}
 
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index 8cea4676f3..db0dc5f524 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -146,7 +146,10 @@
 					size="0 0 100% 100%"
 					tooltip_style="onscreenToolTip">
 					<translatableAttribute id="tooltip">Select a map to play on.</translatableAttribute>
-					<action on="SelectionChange">selectMap(this.list_data[this.selected]);</action>
+					<action on="SelectionChange">
+						if (this.list_data[this.selected]) 
+							selectMap(this.list_data[this.selected]);
+					</action>
 				</object>
 			</object>