From a2c4242994fd94445c3a8cd6ee30b7d51b0271a5 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 2 Nov 2022 16:11:30 +1100
Subject: [PATCH] Simplify Address code

The DefaultCountry code has a fallback already.
---
 app/models/spree/address.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/models/spree/address.rb b/app/models/spree/address.rb
index e4dd2cf5ed..c40cb05a28 100644
--- a/app/models/spree/address.rb
+++ b/app/models/spree/address.rb
@@ -29,12 +29,7 @@ module Spree
     delegate :name, to: :state, prefix: true, allow_nil: true
 
     def self.default
-      country = begin
-        DefaultCountry.country
-      rescue StandardError
-        Spree::Country.first
-      end
-      new(country: country)
+      new(country: DefaultCountry.country)
     end
 
     def full_name