diff --git a/administrator/components/com_jedchecker/libraries/rules/language.php b/administrator/components/com_jedchecker/libraries/rules/language.php
index be7160c..2ba6f42 100644
--- a/administrator/components/com_jedchecker/libraries/rules/language.php
+++ b/administrator/components/com_jedchecker/libraries/rules/language.php
@@ -144,15 +144,7 @@ class JedcheckerRulesLanguage extends JEDcheckerRule
 			// Check for BOM sequence
 			if ($lineno === 0 && strncmp($line, "\xEF\xBB\xBF", 3) === 0)
 			{
-				// Report as an error if BOM is directly followed by key name (and become a part of the name)
-				if (isset($line[3]) && strpos(";\n\r", $line[3]) === false)
-				{
-					$this->report->addError($file, JText::_('COM_JEDCHECKER_LANG_BOM_FOUND'), $startLineno);
-				}
-				else // Otherwise report a warning
-				{
-					$this->report->addWarning($file, JText::_('COM_JEDCHECKER_LANG_BOM_FOUND'), $startLineno);
-				}
+				$this->report->addWarning($file, JText::_('COM_JEDCHECKER_LANG_BOM_FOUND'), $startLineno);
 
 				// Remove BOM for further checks
 				$line = substr($line, 3);
@@ -238,7 +230,7 @@ class JedcheckerRulesLanguage extends JEDcheckerRule
 			$value = ltrim($value);
 
 			// Parse multiline values
-			while (!preg_match('/^((?>\'(?>[^\'\\\\]+|\\\\.)*\'|"(?>[^"\\\\]+|\\\\.)*"|[^\'";]+)*)(;.*)?$/', $value, $matches))
+			while (!preg_match('/^((?>\'[^\']*\'|"(?>[^"\\\\]+|\\\\.)*"|[^\'";]+)*)(;.*)?$/', $value, $matches))
 			{
 				if ($lineno + 1 >= $nLines)
 				{