Merge remote-tracking branch 'remotes/api/MAGETWO-44235-Error-when-tr…

…ying-to-assign-a-store-from-one-website-to-another' into API-Bug-PR
magento · Nov 2, 2015 · a58bda7 · a58bda7
2 parents 6ad87fd + 5a793cc
commit a58bda7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php
@@ -88,7 +88,7 @@ public function getCurrentStoreId()
             }
 
             if (!in_array($store->getId(), $stores)) {
-                throw new NoSuchEntityException(__('Requested scope cannot be loaded'));
+                $store = $this->getDefaultStoreById($defaultStoreId);
             }
         } else {
             $store = $this->getDefaultStoreById($defaultStoreId);