MAGETWO-41964: Log created on random requests - leads to DoS attack

Author: Maksym Aposov

app/code/Magento/Store/Controller/Store/SwitchAction.php

@@ -9,6 +9,7 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context as ActionContext;
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Api\StoreCookieManagerInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\Store;
@@ -78,7 +79,7 @@ public function execute()
             $store = $this->storeRepository->getActiveStoreByCode($storeCode);
         } catch (StoreIsInactiveException $e) {
             $error = __('Requested store is inactive');
-        } catch (\InvalidArgumentException $e) {
+        } catch (NoSuchEntityException $e) {
             $error = __('Requested store is not found');
         }