diff --git a/inc/class_error.php b/inc/class_error.php
index 7c0ef678ee..9e35f60fc1 100644
--- a/inc/class_error.php
+++ b/inc/class_error.php
@@ -180,7 +180,10 @@ function error($type, $message, $file=null, $line=0, $allow_output=true)
 
 		$file = str_replace(MYBB_ROOT, "", $file);
 
-		$this->has_errors = true;
+		if($type == MYBB_SQL || strpos(strtolower($this->error_types[$type]), 'warning') === false)
+		{
+			$this->has_errors = true;
+		}
 
 		// For some reason in the installer this setting is set to "<"
 		$accepted_error_types = array('both', 'error', 'warning', 'none');