diff --git a/lib/base.php b/lib/base.php
index 2e65e9f160..5871ecba83 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -515,13 +515,13 @@ class OC {
 		}
 
 		if (!defined('PHPUNIT_RUN')) {
+			OC\Log\ErrorHandler::setLogger(OC_Log::$object);
 			if (defined('DEBUG') and DEBUG) {
 				OC\Log\ErrorHandler::register(true);
 				set_exception_handler(array('OC_Template', 'printExceptionErrorPage'));
 			} else {
 				OC\Log\ErrorHandler::register();
 			}
-			OC\Log\ErrorHandler::setLogger(OC_Log::$object);
 		}
 
 		// register the stream wrappers