- || FS::cust_location->new({
- map { $_ => $self->get('ship_'.$_) || $self->get($_) } @location_fields
- })
+ # degraded mode--let the system keep running during upgrades
+ || ( $self->get('ship_address1')
+ ? FS::cust_location->new({
+ map { $_ => $self->get('ship_'.$_) } @location_fields
+ })
+ : $self->get('address1')
+ ? FS::cust_location->new({
+ map { $_ => $self->get($_) } @location_fields
+ })
+ : ''
+ );