diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php
index c71f3518..72d58da2 100644
--- a/application/core/ManiaControl.php
+++ b/application/core/ManiaControl.php
@@ -95,11 +95,10 @@ class ManiaControl implements CallbackListener, CommandListener, TimerListener {
 	 * Construct ManiaControl
 	 */
 	public function __construct() {
-		// Construct Error Handler
-		$this->errorHandler = new ErrorHandler($this);
-
 		$this->log('Loading ManiaControl v' . self::VERSION . ' ...');
 
+		$this->errorHandler = new ErrorHandler($this);
+
 		$this->loadConfig();
 
 		// Load ManiaControl Modules
diff --git a/application/core/Utils/ClassUtil.php b/application/core/Utils/ClassUtil.php
index 909ecf4f..3524d7f4 100644
--- a/application/core/Utils/ClassUtil.php
+++ b/application/core/Utils/ClassUtil.php
@@ -10,6 +10,7 @@ namespace ManiaControl\Utils;
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
 abstract class ClassUtil {
+
 	/**
 	 * Get the Class Name of the given Object
 	 *
diff --git a/application/core/Utils/CommandLineHelper.php b/application/core/Utils/CommandLineHelper.php
index 56b2c15d..d01d449a 100644
--- a/application/core/Utils/CommandLineHelper.php
+++ b/application/core/Utils/CommandLineHelper.php
@@ -15,7 +15,7 @@ class CommandLineHelper {
 	 * Get the Command Line Parameter with the given Name
 	 *
 	 * @param string $paramName
-	 * @return mixed
+	 * @return string
 	 */
 	public static function getParameter($paramName) {
 		global $argv;