diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index de0b1710e..13d44c7c1 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2233,9 +2233,12 @@ class AdminProductsControllerCore extends AdminController
 
 		$product = $this->object;
 
-		if ($this->display == 'edit' && Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP && !$product->isAssociatedToShop($this->context->shop->id))
+		if ($this->display == 'edit' && Validate::isLoadedObject($product) && Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP && !$product->isAssociatedToShop($this->context->shop->id))
+		{
 			$this->displayWarning($this->l('Warning: this product does not exist in this shop.'));
-
+			return;
+		}			
+		
 		// Product for multishop
 		$this->context->smarty->assign('bullet_common_field', '');
 		if (Shop::isFeatureActive() && $this->display == 'edit')