diff --git a/application/core/Maps/MapList.php b/application/core/Maps/MapList.php
index 27a92fe0..4b2cb9f1 100644
--- a/application/core/Maps/MapList.php
+++ b/application/core/Maps/MapList.php
@@ -800,7 +800,12 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 				$this->showMapList($player);
 				break;
 			case self::ACTION_SWITCH_MAP:
-				$this->maniaControl->client->jumpToMapIndex($mapId);
+				try {
+					$this->maniaControl->client->jumpToMapIndex($mapId);
+				} catch(\Exception $e) {
+					$this->maniaControl->chat->sendError("Error while Jumping to Map Index");
+					break;
+				}
 				$mapList = $this->maniaControl->mapManager->getMaps();
 				$map     = $mapList[$mapId];