MAGETWO-33814: Change parent class of Model\Exception sub-classes to Localized

Author: Yuri Kovsher

app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php

@@ -90,7 +90,7 @@ public function execute()
                 }
                 $redirectResult->setPath('adminhtml/*/');
                 return $redirectResult;
-            } catch (\Magento\Framework\Model\Exception $e) {
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
                 $this->_getSession()->setPostData($postData);
             } catch (\Exception $e) {

app/code/Magento/Catalog/Controller/Product/View.php

@@ -108,15 +108,13 @@ public function execute()
             $page = $this->resultPageFactory->create(false, ['isIsolated' => true]);
             $this->viewHelper->prepareAndRender($page, $productId, $this, $params);
             return $page;
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+            return $this->noProductRedirect();
         } catch (\Exception $e) {
-            if ($e->getCode() == $this->viewHelper->ERR_NO_PRODUCT_LOADED) {
-                return $this->noProductRedirect();
-            } else {
-                $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
-                $resultForward = $this->resultForwardFactory->create();
-                $resultForward->forward('noroute');
-                return $resultForward;
-            }
+            $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
+            $resultForward = $this->resultForwardFactory->create();
+            $resultForward->forward('noroute');
+            return $resultForward;
         }
     }
 }

app/code/Magento/Catalog/Helper/Product/View.php

@@ -16,8 +16,6 @@
 class View extends \Magento\Framework\App\Helper\AbstractHelper
 {
     // List of exceptions throwable during prepareAndRender() method
-    public $ERR_NO_PRODUCT_LOADED = 1;
-
     public $ERR_BAD_CONTROLLER_INTERFACE = 2;
 
     /**
@@ -198,7 +196,7 @@ public function prepareAndRender(ResultPage $resultPage, $productId, $controller
         // Standard algorithm to prepare and render product view page
         $product = $productHelper->initProduct($productId, $controller, $params);
         if (!$product) {
-            throw new \Magento\Framework\Model\Exception(__('Product is not loaded'), $this->ERR_NO_PRODUCT_LOADED);
+            throw new \Magento\Framework\Exception\NoSuchEntityException(__('Product is not loaded'));
         }
 
         $buyRequest = $params->getBuyRequest();