diff --git a/application/core/Maps/MapManager.php b/application/core/Maps/MapManager.php
index 1a407e92..91e602c3 100644
--- a/application/core/Maps/MapManager.php
+++ b/application/core/Maps/MapManager.php
@@ -578,12 +578,12 @@ class MapManager implements CallbackListener {
 	/**
 	 * Get's a Map by it's Mania-Exchange Id
 	 *
-	 * @param $mxId
+	 * @param int $mxId
 	 * @return Map
 	 */
 	public function getMapByMxId($mxId) {
 		foreach ($this->maps as $map) {
-			if ($map->mx->id == $mxId) {
+			if ($map->mx && $map->mx->id == $mxId) {
 				return $map;
 			}
 		}