diff --git a/classes/CompareProduct.php b/classes/CompareProduct.php
index ba4185bdc..b7880892f 100644
--- a/classes/CompareProduct.php
+++ b/classes/CompareProduct.php
@@ -77,6 +77,12 @@ class CompareProductCore extends ObjectModel
 	 */
 	public static function addCompareProduct($id_compare, $id_product)
 	{
+		// Check if compare row exists
+		$id_compare = Db::getInstance()->getValue('
+			SELECT `id_compare`
+			FROM `'._DB_PREFIX_.'compare`
+			WHERE `id_compare` = '.(int)$id_compare);
+
 		if (!$id_compare)
 		{
 			$id_customer = false;
@@ -161,4 +167,4 @@ class CompareProductCore extends ObjectModel
 		FROM `'._DB_PREFIX_.'compare`
 		WHERE `id_customer`= '.(int)$id_customer);
 	}
-}
\ No newline at end of file
+}
diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index a1f48e818..18bb38755 100755
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -637,8 +637,8 @@ class FrontControllerCore extends Controller
 						}
 						else
 						{
+							$hasBeenSet = !isset($this->context->cookie->iso_code_country);
 							$this->context->cookie->iso_code_country = strtoupper($record->country_code);
-							$hasBeenSet = true;
 						}
 					}
 				}
diff --git a/controllers/front/CompareController.php b/controllers/front/CompareController.php
index 6473640fe..23973cd70 100644
--- a/controllers/front/CompareController.php
+++ b/controllers/front/CompareController.php
@@ -86,7 +86,7 @@ class CompareControllerCore extends FrontController
 
 		if (($product_list = Tools::getValue('compare_product_list')) && ($postProducts = (isset($product_list) ? rtrim($product_list, '|') : '')))
 			$ids = array_unique(explode('|', $postProducts));
-		else if (isset(self::$cookie->id_compare))
+		else if (isset($this->context->cookie->id_compare))
 			$ids = CompareProduct::getCompareProducts($this->context->cookie->id_compare);
 		else
 			$ids = null;