diff --git a/lib/base.php b/lib/base.php
index d22385c86d..86620ff95a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -542,12 +542,10 @@ class OC {
 		\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
 		\OC::$server->getEventLogger()->start('boot', 'Initialize');
 
-		// set some stuff
-		//ob_start();
+		// Don't display errors and log them
 		error_reporting(E_ALL | E_STRICT);
-		if (defined('DEBUG') && DEBUG) {
-			ini_set('display_errors', 1);
-		}
+		@ini_set('display_errors', 0);
+		@ini_set('log_errors', 1);
 
 		date_default_timezone_set('UTC');