MAGETWO-71675: Customer can't see available Payment Method for specific country

omiroshnichenko · omiroshnichenko · commit b3d3f2eaa3d6 · 2018-10-12T13:19:49.000-05:00
diff --git a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
@@ -161,7 +161,7 @@ public function saveAddressInformation(
             $address->setCustomerAddressId(null);
         }
 
-        if (!$billingAddress->getCustomerAddressId()) {
+        if ($billingAddress && !$billingAddress->getCustomerAddressId()) {
             $billingAddress->setCustomerAddressId(null);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public function saveAddressInformation(`
`161`	`161`	`$address->setCustomerAddressId(null);`
`162`	`162`	`}`
`163`	`163`
`164`		`- if (!$billingAddress->getCustomerAddressId()) {`
	`164`	`+ if ($billingAddress && !$billingAddress->getCustomerAddressId()) {`
`165`	`165`	`$billingAddress->setCustomerAddressId(null);`
`166`	`166`	`}`
`167`	`167`