diff --git a/application/core/ErrorHandler.php b/application/core/ErrorHandler.php
index 8336b0db..65ff4de8 100644
--- a/application/core/ErrorHandler.php
+++ b/application/core/ErrorHandler.php
@@ -305,7 +305,7 @@ class ErrorHandler {
 		}
 		$filePath  = substr($errorFile, strlen(ManiaControlDir));
 		$filePath  = str_replace('plugins' . DIRECTORY_SEPARATOR, '', $filePath);
-		$filePath  = str_replace('core' . DIRECTORY_SEPARATOR, '', $filePath);
+		$filePath  = str_replace('core' . DIRECTORY_SEPARATOR, 'ManiaControl\\', $filePath);
 		$className = str_replace('.php', '', $filePath);
 		$className = str_replace(DIRECTORY_SEPARATOR, '\\', $className);
 		if (!class_exists($className, false)) {
diff --git a/application/plugins/steeffeen/EndurancePlugin.php b/application/plugins/steeffeen/EndurancePlugin.php
index 6c619c3a..ca806d0c 100644
--- a/application/plugins/steeffeen/EndurancePlugin.php
+++ b/application/plugins/steeffeen/EndurancePlugin.php
@@ -37,7 +37,6 @@ class EndurancePlugin implements CallbackListener, Plugin {
 	 * @see \ManiaControl\Plugins\Plugin::prepare()
 	 */
 	public static function prepare(ManiaControl $maniaControl) {
-		//do nothing
 	}
 
 	/**