diff --git a/application/core/Formatter.php b/application/core/Formatter.php
index 9dfde90a..21268ad3 100644
--- a/application/core/Formatter.php
+++ b/application/core/Formatter.php
@@ -11,6 +11,16 @@ namespace ManiaControl;
  */
 abstract class Formatter {
 
+	/**
+	 * Return the given Text with Escaping around it
+	 *
+	 * @param string $text
+	 * @return string
+	 */
+	public static function escapeText($text) {
+		return '$<' . $text . '$>';
+	}
+
 	/**
 	 * Format the given Time (in Milliseconds)
 	 *
diff --git a/application/core/Maps/Map.php b/application/core/Maps/Map.php
index 6a37873c..db552fc1 100644
--- a/application/core/Maps/Map.php
+++ b/application/core/Maps/Map.php
@@ -70,6 +70,15 @@ class Map {
 		$this->authorNick = $this->authorLogin;
 	}
 
+	/**
+	 * Get the escaped Map Name
+	 *
+	 * @return string
+	 */
+	public function getEscapedName() {
+		return Formatter::escapeText($this->name);
+	}
+
 	/**
 	 * Get's the gameType of the Current Map
 	 *
diff --git a/application/core/Players/Player.php b/application/core/Players/Player.php
index dc7a08fa..d547539c 100644
--- a/application/core/Players/Player.php
+++ b/application/core/Players/Player.php
@@ -68,7 +68,7 @@ class Player {
 	 * Construct a new Player
 	 *
 	 * @param ManiaControl $maniaControl
-	 * @param bool $connected
+	 * @param bool         $connected
 	 */
 	public function __construct(ManiaControl $maniaControl, $connected) {
 		$this->maniaControl = $maniaControl;
@@ -78,6 +78,19 @@ class Player {
 		}
 	}
 
+	/**
+	 * Get the Escaped Nickname
+	 *
+	 * @return string
+	 */
+	public function getEscapedNickname() {
+		$nickname = $this->nickname;
+		if (!$nickname) {
+			$nickname = $this->login;
+		}
+		return Formatter::escapeText($nickname);
+	}
+
 	/**
 	 * Update from ManiaPlanet PlayerInfo structure
 	 *
diff --git a/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php b/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php
index 526dcee4..2465f321 100644
--- a/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php
+++ b/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php
@@ -176,8 +176,8 @@ class DedimaniaPlugin implements CallbackListener, CommandListener, TimerListene
 		$this->maniaControl->fileReader->postData(self::DEDIMANIA_URL, function ($data, $error) use (&$self) {
 			$self->maniaControl->log("Try to connect on Dedimania");
 
-			if ($error != '') {
-				$self->maniaControl->log("Dedimania Error: " . $error);
+			if (!$data || $error) {
+				$self->maniaControl->log("Dedimania Error: '{$error}'");
 			}
 
 			$data = $self->decode($data);