diff --git a/gulliver/system/class.i18n_po.php b/gulliver/system/class.i18n_po.php
index 8309f0b92..4f06e3bf5 100755
--- a/gulliver/system/class.i18n_po.php
+++ b/gulliver/system/class.i18n_po.php
@@ -264,8 +264,17 @@ class i18n_PO
 
         //verifying the headers data
         if (! isset( $this->_meta['X-Poedit-Language'] )) {
-            $this->flagError = true;
-            $errMsg = "X-Poedit-Language meta doesn't exist";
+            if (! isset( $this->_meta['Language'] )) {
+                $this->flagError = true;
+                $errMsg = "X-Poedit-Language and Language meta doesn't exist";
+            } else if ($this->_meta['Language'] == '') {
+                $this->flagError = true;
+                $errMsg = "Language meta is empty";
+            } else {
+                $this->_meta['X-Poedit-Language'] = $this->_meta['Language'];
+                unset($this->_meta['Language']);
+                $this->flagError = false;
+            }
         } else if ($this->_meta['X-Poedit-Language'] == '') {
             $this->flagError = true;
             $errMsg = "X-Poedit-Language meta is empty";
diff --git a/workflow/engine/classes/model/Language.php b/workflow/engine/classes/model/Language.php
index 0d9c8127c..9360fd518 100755
--- a/workflow/engine/classes/model/Language.php
+++ b/workflow/engine/classes/model/Language.php
@@ -233,7 +233,7 @@ class Language extends BaseLanguage
 
                     if (count( $match ) < 4) {
                         $near = isset( $rowTranslation['msgid'] ) ? $rowTranslation['msgid'] : (isset( $rowTranslation['msgstr'] ) ? $rowTranslation['msgstr'] : '');
-                        $errorMsg .= "Invalid Translation reference: \"$reference\",  near -> " . $near . "\n";
+                        $errorMsg .= "Invalid Translation reference: \"$reference\",  near -> " . strip_tags($near) . "\n";
                         continue;
                     }