diff --git a/app/services/default_address_updater.rb b/app/services/default_address_updater.rb
index 35b01cbbc5..39d0dde130 100644
--- a/app/services/default_address_updater.rb
+++ b/app/services/default_address_updater.rb
@@ -15,7 +15,7 @@ class DefaultAddressUpdater
     assign_bill_addresses
     assign_ship_addresses
 
-    customer.save
+    customer&.save
     user&.save
   end
 
diff --git a/spec/system/consumer/split_checkout_spec.rb b/spec/system/consumer/split_checkout_spec.rb
index e40cae8a5d..80eec57fcb 100644
--- a/spec/system/consumer/split_checkout_spec.rb
+++ b/spec/system/consumer/split_checkout_spec.rb
@@ -284,6 +284,18 @@ describe "As a consumer, I want to checkout my order" do
       visit checkout_path
     end
 
+    context "when no selecting a shipping method" do
+      before do
+        fill_out_details
+        fill_out_billing_address
+      end
+
+      it "errors is shown to the user when submitting the form" do
+        click_button "Next - Payment method"
+        expect(page).to have_content "Select a shipping method"
+      end
+    end
+
     context "details step" do
       context "when form is submitted but invalid" do
         it "display the checkbox about shipping address same as billing address when selecting a shipping method that requires ship address" do