diff --git a/application/core/Maps/MapCommands.php b/application/core/Maps/MapCommands.php
index 8fbc25af..82f7135a 100644
--- a/application/core/Maps/MapCommands.php
+++ b/application/core/Maps/MapCommands.php
@@ -185,9 +185,10 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
 			$this->maniaControl->authenticationManager->sendNotAllowed($player);
 			return;
 		}
-
-		$this->maniaControl->client->nextMap();
-
+		try {
+			$this->maniaControl->client->nextMap();
+		} catch(ChangeInProgressException $e) {
+		}
 		$message = '$<' . $player->nickname . '$> skipped the current Map!';
 		$this->maniaControl->chat->sendSuccess($message);
 		$this->maniaControl->log($message, true);