Merge branch 'MAGETWO-34988' into MAGETWO-26762

Author: vpaladiychuk

lib/internal/Magento/Framework/App/FrontController.php

@@ -80,10 +80,9 @@ public function dispatch(RequestInterface $request)
      * Handle exception
      *
      * @param \Exception $e
-     * @param \Magento\Framework\App\ActionInterface $actionInstance
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @return void
      */
-    protected function handleException($e, $actionInstance)
+    protected function handleException($e)
     {
         $needToMaskDisplayMessage = !($e instanceof \Magento\Framework\Exception\LocalizedException)
             && ($this->appState->getMode() != State::MODE_DEVELOPER);
@@ -92,7 +91,6 @@ protected function handleException($e, $actionInstance)
             : $e->getMessage();
         $this->messageManager->addError($displayMessage);
         $this->logger->critical($e->getMessage());
-        return $actionInstance->getDefaultRedirect();
     }
 
     /**
@@ -116,7 +114,8 @@ protected function processRequest(RequestInterface $request)
                     } catch (Action\NotFoundException $e) {
                         throw $e;
                     } catch (\Exception $e) {
-                        $result = $this->handleException($e, $actionInstance);
+                        $this->handleException($e);
+                        $result = $actionInstance->getDefaultRedirect();
                     }
                     break;
                 }

lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php

@@ -6,7 +6,7 @@
 namespace Magento\Framework\App\Test\Unit;
 
 use Magento\Framework\App\Action\NotFoundException;
-use \Magento\Framework\App\State;
+use Magento\Framework\App\State;
 
 class FrontControllerTest extends \PHPUnit_Framework_TestCase
 {