diff --git a/phpBB/common.php b/phpBB/common.php
index 9564ffa605..afa410ef66 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -23,7 +23,8 @@ if (!defined('IN_PHPBB'))
 $starttime = explode(' ', microtime());
 $starttime = $starttime[1] + $starttime[0];
 
-error_reporting(E_ERROR | E_WARNING | E_PARSE);
+// Report all errors, except strict and notice
+error_reporting(E_ALL ^ (E_NOTICE & E_STRICT));
 
 /*
 * Remove variables created by register_globals from the global scope
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index a82ee15833..ea3c41f08b 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1797,8 +1797,11 @@ function split_sql_file($sql, $delimiter)
 	{
 		$data[$key] = trim($value);
 	}
+
 	// The empty case
-	if (empty(end($data)))
+	$end_data = end($data);
+
+	if (empty($end_data))
 	{
 		unset($data[key($data)]);
 	}