diff --git a/phpBB/common.php b/phpBB/common.php
index b91fd01706..5f4216d1d7 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -21,7 +21,6 @@ $starttime = $starttime[1] + $starttime[0];
 
 // Report all errors, except notices
 error_reporting(E_ALL ^ E_NOTICE);
-//error_reporting(E_ALL | E_STRICT);
 
 /*
 * Remove variables created by register_globals from the global scope
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 5005033166..9379284326 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2817,10 +2817,11 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 	{
 		case E_NOTICE:
 		case E_WARNING:
+		case E_STRICT:
 
 			// Check the error reporting level and return if the error level does not match
 			// If DEBUG is defined the default level is E_ALL
-			if (($errno & ((defined('DEBUG')) ? E_ALL : error_reporting())) == 0)
+			if (($errno & ((defined('DEBUG')) ? E_ALL | E_STRICT : error_reporting())) == 0)
 			{
 				return;
 			}
@@ -2847,6 +2848,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 
 		break;
 
+		case E_RECOVERABLE_ERROR:
 		case E_USER_ERROR:
 
 			if (!empty($user) && !empty($user->lang))
diff --git a/phpBB/style.php b/phpBB/style.php
index 7dfd3886ff..3e923b8f53 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -14,6 +14,10 @@
 define('IN_PHPBB', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
+
+// Report all errors, except notices
+error_reporting(E_ALL ^ E_NOTICE);
+
 require($phpbb_root_path . 'config.' . $phpEx);
 
 if (version_compare(PHP_VERSION, '6.0.0-dev', '<'))