diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php
index 10ef52d..e3ab66d 100644
--- a/Sccp_manager.class.php
+++ b/Sccp_manager.class.php
@@ -1881,7 +1881,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
                             $lang = (empty($hwlang[1])) ? $this->sccpvalues['devlang']['data'] : $hwlang[1];
 //                            $lang=$this->sccpvalues['devlang']['data'];
                         }
-                        if (!empty($lang) && $lang  !='null') {
+                        if (($lang  !='null') && (!empty(trim($lang)))) {
                             if ($key == 'networkLocale') {
                                 $xml_work->$key = $lang;
                             } else {
diff --git a/Sccp_manager.inc/extconfigs.class.php b/Sccp_manager.inc/extconfigs.class.php
index 4f17c0e..9573dfd 100644
--- a/Sccp_manager.inc/extconfigs.class.php
+++ b/Sccp_manager.inc/extconfigs.class.php
@@ -50,7 +50,7 @@ class extconfigs {
                 if (isset($result[$index])) {
                     return $result[$index];
                 } else {
-                    return array('');
+                    return array();
                 }
             }
         }