diff --git a/application/core/Maps/MapQueue.php b/application/core/Maps/MapQueue.php
index 8d171740..e32e19d5 100644
--- a/application/core/Maps/MapQueue.php
+++ b/application/core/Maps/MapQueue.php
@@ -9,7 +9,7 @@ use ManiaControl\Commands\CommandListener;
 use ManiaControl\Formatter;
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
-use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
+use Maniaplanet\DedicatedServer\InvalidArgumentException;
 
 /**
  * MapQueue Class
@@ -184,8 +184,7 @@ class MapQueue implements CallbackListener, CommandListener {
 
 		try {
 			$this->maniaControl->client->chooseNextMap($map->fileName);
-		} catch(Exception $e) {
-			// TODO: is it even possible that an exception other than connection errors will be thrown? - remove try-catch?
+		} catch(InvalidArgumentException $e) {
 			//do nothing
 		}
 	}