MAGETWO-94347: Implement handling of large number of addresses on storefront Address book

Author: le0n4eg

app/code/Magento/Customer/Block/Address/Grid.php

@@ -227,14 +227,15 @@ private function preparePager(): void
      */
     private function getAddressCollection(): \Magento\Customer\Model\ResourceModel\Address\Collection
     {
-        if (null === $this->addressCollection && $this->getCustomer()) {
+        if (null === $this->addressCollection) {
+            if (null === $this->getCustomer()) {
+                throw new NoSuchEntityException(__('Customer not logged in'));
+            }
             /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
             $collection = $this->addressCollectionFactory->create();
             $collection->setOrder('entity_id', 'desc')
                 ->setCustomerFilter([$this->getCustomer()->getId()]);
             $this->addressCollection = $collection;
-        } elseif (null === $this->getCustomer()) {
-            throw new NoSuchEntityException(__('Customer not logged in'));
         }
         return $this->addressCollection;
     }