diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php
index f548ac17..1315eccd 100644
--- a/application/core/ManiaControl.php
+++ b/application/core/ManiaControl.php
@@ -276,7 +276,6 @@ class ManiaControl implements CommandListener, TimerListener {
 		if ($message) {
 			$this->log($message);
 		}
-
 		exit();
 	}
 
@@ -414,7 +413,7 @@ class ManiaControl implements CommandListener, TimerListener {
 		// Wait for server to be ready
 		try {
 			if (!$this->server->waitForStatus(4)) {
-				trigger_error("Server couldn't get ready!", E_USER_ERROR);
+				$this->quit("Server couldn't get ready!");
 			}
 		} catch (Exception $e) {
 			// TODO remove
diff --git a/application/core/Server/Server.php b/application/core/Server/Server.php
index aa0cfa5a..9cbc899a 100644
--- a/application/core/Server/Server.php
+++ b/application/core/Server/Server.php
@@ -25,9 +25,7 @@ class Server implements CallbackListener {
 	/*
 	 * Public Properties
 	 */
-	/**
-	 * @var Config $config
-	 */
+	/** @var Config $config */
 	public $config = null;
 	public $index = -1;
 	public $ip = null;
@@ -59,7 +57,7 @@ class Server implements CallbackListener {
 		$this->serverCommands = new ServerCommands($maniaControl);
 		$this->usageReporter  = new UsageReporter($maniaControl);
 		$this->rankingManager = new RankingManager($maniaControl);
-		$this->scriptManager = new ScriptManager($maniaControl);
+		$this->scriptManager  = new ScriptManager($maniaControl);
 
 		// Register for callbacks
 		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'onInit');
@@ -259,7 +257,7 @@ class Server implements CallbackListener {
 		if (!$dataDirectory) {
 			return null;
 		}
-		return "{$dataDirectory}Maps".DIRECTORY_SEPARATOR;
+		return "{$dataDirectory}Maps" . DIRECTORY_SEPARATOR;
 	}
 
 	/**