diff --git a/stock.py b/stock.py
index 2e01bee718..d68478fcd3 100644
--- a/stock.py
+++ b/stock.py
@@ -249,7 +249,7 @@ class CreateShippingUPS(Wizard):
                 'AddressLine': (address.street or '').splitlines(),
                 'City': address.city,
                 'PostalCode': address.zip,
-                'CountryCode': address.country.code,
+                'CountryCode': address.country.code if address.country else '',
                 },
             }