diff --git a/e107_handlers/e_marketplace.php b/e107_handlers/e_marketplace.php
index e2abded4a..2ef98f481 100644
--- a/e107_handlers/e_marketplace.php
+++ b/e107_handlers/e_marketplace.php
@@ -561,18 +561,20 @@ class e_marketplace_adapter_wsdl extends e_marketplace_adapter_abstract
 			'exception' 			=> true,
 		    "uri" 					=> "http://server.soap.e107.inc.com/",
 		    'cache_wsdl'			=> WSDL_CACHE_NONE,
-		    'connection_timeout' 	=> 60,
+		    'connection_timeout' 	=> 7,
 		);
 
 
 		try
 		{
+			//libxml_disable_entity_loader(false);
             $this->client = new SoapClient($this->serviceUrl, $options);
         }
         catch (Exception $e)
         {
-           e107::getMessage()->addError(TPVLAN_90);
-           e107::getMessage()->addDebug($e->getMessage());
+	        $message = deftrue('LAN_ERROR_CONNECTION', "Unable to connect for updates. Please check firewall and/or internet connection.");
+            e107::getMessage()->addInfo($message);
+            e107::getMessage()->addDebug($e->getMessage());
         }
 
 
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 461e997cb..0c4444077 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -519,3 +519,5 @@ define("LAN_ITEM", "Item");
 define("LAN_LOCK", "Lock");
 define("LAN_SYSTEM_USER", "System user");
 define("LAN_ENGINE", "Engine");
+
+define("LAN_ERROR_CONNECTION","Unable to connect for updates. Please check firewall and/or internet connection.");
diff --git a/e107_languages/English/admin/lan_theme.php b/e107_languages/English/admin/lan_theme.php
index f128d0ef2..6fea19b43 100644
--- a/e107_languages/English/admin/lan_theme.php
+++ b/e107_languages/English/admin/lan_theme.php
@@ -124,4 +124,4 @@ define("TPVLAN_86","Could not change site theme.");
 define("TPVLAN_88","Converter");
 define("TPVLAN_89", "Apply dashboard preferences to all administrators");
 
-define("TPVLAN_90","Unable to connect. Please check firewall and/or internet connection.");
+