diff --git a/application/core/ManiaExchange/ManiaExchangeInfoSearcher.php b/application/core/ManiaExchange/ManiaExchangeInfoSearcher.php
index ec493820..aecde968 100644
--- a/application/core/ManiaExchange/ManiaExchangeInfoSearcher.php
+++ b/application/core/ManiaExchange/ManiaExchangeInfoSearcher.php
@@ -44,6 +44,19 @@ class ManiaExchangeInfoSearcher {
 		$this->maniaControl = $maniaControl;
 	}
 
+
+
+	public function updateMapObjectWithManiaExchangeIds(){
+		$maps = $this->maniaControl->mapManager->getMaps();
+
+		foreach($maps as $map){
+
+		}
+
+
+	}
+
+
 	/**
 	 * Gets a Maplist from Mania Exchange
 	 *
diff --git a/application/core/Maps/MapManager.php b/application/core/Maps/MapManager.php
index 26364db4..7f2ebfcd 100644
--- a/application/core/Maps/MapManager.php
+++ b/application/core/Maps/MapManager.php
@@ -79,6 +79,7 @@ class MapManager implements CallbackListener {
 		$mysqli = $this->maniaControl->database->mysqli;
 		$query  = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_MAPS . "` (
 				`index` int(11) NOT NULL AUTO_INCREMENT,
+				`mxid` int(11),
 				`uid` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
 				`name` varchar(150) COLLATE utf8_unicode_ci NOT NULL,
 				`authorLogin` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
@@ -351,7 +352,6 @@ class MapManager implements CallbackListener {
 			}
 			// Add map to map list
 			if(!$this->maniaControl->client->query('InsertMap', $mapFileName)) {
-				// TODO irgendein bug?
 				$this->maniaControl->chat->sendError("Couldn't add map to match settings!", $login);
 				return;
 			}
diff --git a/application/core/Statistics/StatisticCollector.php b/application/core/Statistics/StatisticCollector.php
index a7cc8aaa..219421db 100644
--- a/application/core/Statistics/StatisticCollector.php
+++ b/application/core/Statistics/StatisticCollector.php
@@ -164,7 +164,8 @@ class StatisticCollector implements CallbackListener {
 			case 'LibXmlRpc_OnArmorEmpty':
 				$shooter = $this->maniaControl->playerManager->getPlayer($callback[1][1][0]);
 				$victim  = $this->maniaControl->playerManager->getPlayer($callback[1][1][1]);
-				$this->maniaControl->statisticManager->incrementStat(self::STAT_ON_KILL, $shooter);
+				if($shooter != null)
+					$this->maniaControl->statisticManager->incrementStat(self::STAT_ON_KILL, $shooter);
 				$this->maniaControl->statisticManager->incrementStat(self::STAT_ON_DEATH, $victim);
 				break;
 			case 'LibXmlRpc_OnPlayerRequestRespawn':
@@ -197,7 +198,8 @@ class StatisticCollector implements CallbackListener {
 				$victim       = $this->maniaControl->playerManager->getPlayer($paramsObject->Event->Victim->Login);
 				$this->maniaControl->statisticManager->incrementStat(self::STAT_ON_DEATH, $victim);
 				$shooter = $this->maniaControl->playerManager->getPlayer($paramsObject->Event->Shooter->Login);
-				$this->maniaControl->statisticManager->incrementStat(self::STAT_ON_KILL, $shooter);
+				if($shooter != null)
+					$this->maniaControl->statisticManager->incrementStat(self::STAT_ON_KILL, $shooter);
 				break;
 			case 'OnRequestRespawn':
 				$paramsObject = json_decode($callback[1][1]);