diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php index 67327f1012ebd9499b7d35c90962fa6551d88954..abf0180b52b174945926b3e1a8f4f67c7c5b5ca5 100644 --- a/app/code/Magento/Customer/Model/Customer.php +++ b/app/code/Magento/Customer/Model/Customer.php @@ -719,7 +719,7 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel $primaryShipping = $this->getPrimaryShippingAddress(); if ($primaryShipping) { - if ($primaryBilling->getId() == $primaryShipping->getId()) { + if ($primaryBilling && $primaryBilling->getId() == $primaryShipping->getId()) { $primaryBilling->setIsPrimaryShipping(true); } else { $primaryShipping->setIsPrimaryShipping(true);