diff --git a/core/Callbacks/Structures/TrackMania/OnStuntEventStructure.php b/core/Callbacks/Structures/TrackMania/OnStuntEventStructure.php
index 48f8461a..87e183bb 100644
--- a/core/Callbacks/Structures/TrackMania/OnStuntEventStructure.php
+++ b/core/Callbacks/Structures/TrackMania/OnStuntEventStructure.php
@@ -74,7 +74,7 @@ class OnStuntEventStructure extends BasePlayerTimeStructure {
 	public function getStuntsScore() {
 		return $this->stuntsScore;
 	}
-	
+
 	/**
 	 * @api
 	 * @return mixed
diff --git a/core/Maps/MapManager.php b/core/Maps/MapManager.php
index 69a3193f..1e4c4ef0 100644
--- a/core/Maps/MapManager.php
+++ b/core/Maps/MapManager.php
@@ -1013,6 +1013,11 @@ class MapManager implements CallbackListener, CommunicationListener, UsageInform
 	private function searchMaps($searchString, $searchBy = self::SEARCH_BY_MAP_NAME) {
 		$result       = array();
 		$searchString = strtolower($searchString);
+
+		if($searchString == ''){
+			return $result;
+		}
+
 		foreach ($this->maps as $map) {
 			switch ($searchBy) {
 				case self::SEARCH_BY_MAP_NAME: