From 1c4162ff2eb175df261cbb0f9d893eb409e67c2d Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Mon, 20 Feb 2012 09:14:01 +0000
Subject: [PATCH] // You shall not DIE!

---
 classes/controller/FrontController.php      | 2 +-
 classes/order/Order.php                     | 2 +-
 controllers/admin/AdminOrdersController.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 8992b937c..9e251d7db 100755
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -159,7 +159,7 @@ class FrontControllerCore extends Controller
 
 		/* Theme is missing or maintenance */
 		if (!is_dir(_PS_THEME_DIR_))
-			die(Tools::displayError('Current theme unavailable. Please check your theme directory name and permissions.'));
+			die(sprintf(Tools::displayError('Current theme unavailable "%s". Please check your theme directory name and permissions.'), basename(rtrim(_PS_THEME_DIR_, '/\\'))));
 		elseif (basename($_SERVER['PHP_SELF']) != 'disabled.php' && !(int)(Configuration::get('PS_SHOP_ENABLE')))
 			$this->maintenance = true;
 		elseif (Configuration::get('PS_GEOLOCATION_ENABLED'))
diff --git a/classes/order/Order.php b/classes/order/Order.php
index 98a772664..7bfe87962 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -1120,7 +1120,7 @@ class OrderCore extends ObjectModel
 		$order = new Order($id_order);
 		$orderState = $order->getCurrentOrderState();
 		if (!Validate::isLoadedObject($orderState) || !Validate::isLoadedObject($order))
-			throw new PrestaShopException(sprintf('unable to load order id %s and/or its state', $id_order));
+			return '';
 		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 1f1793db9..5b6f48d00 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))
-			throw new PrestaShopException(sprintf('unable to load order id %s and/or its state', $id_order));
+			return '';
 
 		$this->context->smarty->assign(array(
 			'order' => $order,