diff --git a/classes/order/Order.php b/classes/order/Order.php
index d505af8b5..98a772664 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -291,7 +291,7 @@ class OrderCore extends ObjectModel
 		if ($this->hasBeenDelivered())
 		{
 			if (!Configuration::get('PS_ORDER_RETURN'))
-				die(Tools::displayError());
+				throw new PrestaShopException('PS_ORDER_RETURN is not defined in table configuration');
 			$orderDetail->product_quantity_return += (int)($quantity);
 			return $orderDetail->update();
 		}
@@ -1120,7 +1120,7 @@ class OrderCore extends ObjectModel
 		$order = new Order($id_order);
 		$orderState = $order->getCurrentOrderState();
 		if (!Validate::isLoadedObject($orderState) || !Validate::isLoadedObject($order))
-			die(Tools::displayError('Invalid objects'));
+			throw new PrestaShopException(sprintf('unable to load order id %s and/or its state', $id_order));
 		echo '<span style="width:20px; margin-right:5px;">';
 		if (($orderState->invoice && $order->invoice_number) && (int)($tr['product_number']))
 			echo '<a target="_blank" href="pdf.php?id_order='.(int)$order->id.'&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>';
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 7a5cf0937..1f1793db9 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -165,7 +165,7 @@ class AdminOrdersControllerCore extends AdminController
 		$order = new Order($id_order);
 		$order_state = $order->getCurrentOrderState();
 		if (!Validate::isLoadedObject($order_state) || !Validate::isLoadedObject($order))
-			die(Tools::displayError('Invalid objects'));
+			throw new PrestaShopException(sprintf('unable to load order id %s and/or its state', $id_order));
 
 		$this->context->smarty->assign(array(
 			'order' => $order,