diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php index 300373822b435..29fa71a9003f0 100755 --- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php +++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php @@ -7,6 +7,7 @@ namespace Magento\UrlRewriteGraphQl\Model\Resolver; +use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\GraphQl\Config\Element\Field; use Magento\Framework\GraphQl\Query\ResolverInterface; use Magento\Framework\GraphQl\Query\Uid; @@ -58,19 +59,23 @@ public function resolve( ); $storeId = (int)$context->getExtensionAttributes()->getStore()->getId(); if ($resultArray) { - $result = []; - if (isset($resultArray['type'])) { - $result = $this->entityDataProviderComposite->getData( - $resultArray['type'], - (int)$resultArray['id'], - $info, - $storeId - ); + try { + $result = []; + if (isset($resultArray['type'])) { + $result = $this->entityDataProviderComposite->getData( + $resultArray['type'], + (int)$resultArray['id'], + $info, + $storeId + ); + } + $result['redirect_code'] = $resultArray['redirect_code']; + $result['relative_url'] = $resultArray['relative_url']; + $result['type'] = $resultArray['type']; + return $result; + } catch (NoSuchEntityException) { + return null; } - $result['redirect_code'] = $resultArray['redirect_code']; - $result['relative_url'] = $resultArray['relative_url']; - $result['type'] = $resultArray['type']; - return $result; } return null; }