diff --git a/classes/Tools.php b/classes/Tools.php
index bd30defc6..5b7ad5f4e 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1517,7 +1517,7 @@ class ToolsCore
 		foreach (ShopUrl::getShopUrls() as $shop_url)
 		{
 			if (!isset($domains[$shop_url->domain]))
-				$domains[$shop_url['domain']] = array();
+				$domains[$shop_url->domain] = array();
 
 			$domains[$shop_url->domain][] = array(
 				'physical' =>	$shop_url->physical_uri,
diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php
index 4e0204dcc..f03142f3e 100644
--- a/controllers/admin/AdminShopUrlController.php
+++ b/controllers/admin/AdminShopUrlController.php
@@ -254,9 +254,10 @@ class AdminShopUrlControllerCore extends AdminController
 				$this->_errors[] = Tools::displayError('A shop url that use this domain and uri already exists');
 
 			parent::postProcess();
-			Tools::generateHtaccess(dirname(__FILE__).'/../../.htaccess', Configuration::get('PS_REWRITING_SETTINGS'), Configuration::get('PS_HTACCESS_CACHE_CONTROL'), '');
+			if (!$this->_errors)
+				Tools::generateHtaccess(dirname(__FILE__).'/../../.htaccess', Configuration::get('PS_REWRITING_SETTINGS'), Configuration::get('PS_HTACCESS_CACHE_CONTROL'), '');
 		}
-		else if ((isset($_GET['status'.$this->table]) || isset($_GET['status'])) && Tools::getValue($this->identifier))
+		elseif ((isset($_GET['status'.$this->table]) || isset($_GET['status'])) && Tools::getValue($this->identifier))
 		{
 			if ($this->tabAccess['edit'] === '1')
 			{
@@ -264,7 +265,7 @@ class AdminShopUrlControllerCore extends AdminController
 				{
 					if ($object->main)
 						$this->_errors[] = Tools::displayError('You can\'t disable a main url');
-					else if ($object->toggleStatus())
+					elseif ($object->toggleStatus())
 						Tools::redirectAdmin(self::$currentIndex.'&conf=5&token='.$token);
 					else
 						$this->_errors[] = Tools::displayError('An error occurred while updating status.');