diff --git a/modules/order/src/Plugin/Commerce/Condition/CustomerAddressBase.php b/modules/order/src/Plugin/Commerce/Condition/CustomerAddressBase.php index 7a937a6285b9ac35b73c7bed94d0d14056a65ee7..4a74967b661183c56d0937ffaa45dacc695e8972 100644 --- a/modules/order/src/Plugin/Commerce/Condition/CustomerAddressBase.php +++ b/modules/order/src/Plugin/Commerce/Condition/CustomerAddressBase.php @@ -73,6 +73,10 @@ abstract class CustomerAddressBase extends ConditionBase { 'label' => 'N/A', ] + $this->configuration['zone']); $address = $profile->get('address')->first(); + if (!$address) { + // The conditions can't be applied without address. + return FALSE; + } return $zone->match($address); }