diff --git a/classes/Address.php b/classes/Address.php
index 9084f0a1543a8..39795585c8383 100644
--- a/classes/Address.php
+++ b/classes/Address.php
@@ -174,7 +174,7 @@ public function add($autodate = true, $null_values = false)
 			Customer::resetAddressCache($this->id_customer);
 		return true;
 	}
-	
+
 	public function update($null_values = false)
 	{
 		// Empty related caches
@@ -359,7 +359,7 @@ public static function initialize($id_address = null, $with_geoloc = false)
 			$address = new Address((int)$id_address);
 
 			if (!Validate::isLoadedObject($address))
-				throw new PrestaShopException('Invalid address');
+				throw new PrestaShopException('Invalid address #'.(int)$id_address);
 		}
 		elseif ($with_geoloc && isset($context->customer->geoloc_id_country))
 		{
@@ -398,7 +398,7 @@ public static function getAddressIdBySupplierId($id_supplier)
 		$query->where('id_warehouse = 0');
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
 	}
-	
+
 	public static function aliasExist($alias, $id_address, $id_customer)
 	{
 		$query = new DbQuery();