diff --git a/classes/Currency.php b/classes/Currency.php
index bf9cca614..af07ba30d 100644
--- a/classes/Currency.php
+++ b/classes/Currency.php
@@ -188,8 +188,9 @@ class CurrencyCore extends ObjectModel
 			4 => array('left' => '', 'right' => &$formated_strings['right']),
 			5 => array('left' => '', 'right' => &$formated_strings['right'])
 		);
-
-		return ($formats[$this->format][$side]);
+		if (isset($formats[$this->format][$side]))
+			return ($formats[$this->format][$side]);
+		return $this->sign;
 	}
 
 	/**
diff --git a/classes/Product.php b/classes/Product.php
index 5a8600fed..5c91ccb90 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -2509,7 +2509,7 @@ class ProductCore extends ObjectModel
 		$id_state = 0;
 		$zipcode = 0;
 
-		if (!$id_address)
+		if (!$id_address && Validate::isLoadedObject($cur_cart))
 			$id_address = $cur_cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')};
 
 		if ($id_address)