diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index da74d332f..6e8574603 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -449,9 +449,9 @@ class OrderOpcControllerCore extends ParentOrderController
 			$groups = $this->context->customer->getGroups();
 		else
 			$groups = array(1);
-		if (!Address::isCountryActiveById((int)($this->context->cart->id_address_delivery)))
+		if (!Address::isCountryActiveById((int)($this->context->cart->id_address_delivery)) && $this->context->cart->id_address_delivery != 0)
 			$this->errors[] = Tools::displayError('This address is not in a valid area.');
-		elseif (!Validate::isLoadedObject($address_delivery) OR $address_delivery->deleted)
+		elseif ((!Validate::isLoadedObject($address_delivery) OR $address_delivery->deleted) && $this->context->cart->id_address_delivery != 0)
 			$this->errors[] = Tools::displayError('This address is invalid.');
 		else
 		{
diff --git a/themes/prestashop/shopping-cart.tpl b/themes/prestashop/shopping-cart.tpl
index fa992782b..d8466c445 100644
--- a/themes/prestashop/shopping-cart.tpl
+++ b/themes/prestashop/shopping-cart.tpl
@@ -393,14 +393,6 @@
 		{/foreach}
 		<p class="clear" />
 	{/if}
-	{* @todo Replace the $carrier by using delivery_option *}
-	{if $carrier->id AND !isset($virtualCart)}
-	<div id="order_carrier">
-		<h4>{l s='Carrier:'}</h4>
-		{if isset($carrierPicture)}<img src="{$img_ship_dir}{$carrier->id}.jpg" alt="{l s='Carrier'}" />{/if}
-		<span>{$carrier->name|escape:'htmlall':'UTF-8'}</span>
-	</div>
-	{/if}
 </div>
 {/if}
 <p class="cart_navigation">