diff --git a/application/core/Maps/MapManager.php b/application/core/Maps/MapManager.php
index 7d942971..61f361ed 100644
--- a/application/core/Maps/MapManager.php
+++ b/application/core/Maps/MapManager.php
@@ -562,7 +562,10 @@ class MapManager implements CallbackListener {
 	 * Restructures the Maplist
 	 */
 	public function restructureMapList() {
-		$currentIndex = $this->getMapIndex($this->currentMap);
+		$currentIndex = 0;
+		if ($this->currentMap) {
+			$currentIndex = $this->getMapIndex($this->currentMap);
+		}
 
 		// No RestructureNeeded
 		if ($currentIndex < Maplist::MAX_MAPS_PER_PAGE - 1) {