Merge pull request #467 from magento-goinc/pr-452

[SWAT] Bug fixes

Author: mslabko

app/code/Magento/Review/Controller/Product/ListAjax.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Review\Controller\Product;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Review\Controller\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
 
@@ -17,9 +18,13 @@ class ListAjax extends ProductController
      */
     public function execute()
     {
-        $this->initProduct();
-        /** @var \Magento\Framework\View\Result\Layout $resultLayout */
-        $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
+        if (!$this->initProduct()) {
+            throw new LocalizedException(__('Cannot initialize product'));
+        } else {
+            /** @var \Magento\Framework\View\Result\Layout $resultLayout */
+            $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
+        }
+
         return $resultLayout;
     }
 }

app/code/Magento/Search/view/frontend/web/form-mini.js

@@ -249,7 +249,7 @@ define([
 
                     this.responseList.indexList
                         .on('click', function (e) {
-                            this.responseList.selected = $(e.target);
+                            this.responseList.selected = $(e.currentTarget);
                             this.searchForm.trigger('submit');
                         }.bind(this))
                         .on('mouseenter mouseleave', function (e) {