[MERGE] Forward-port saas-4 up to 8b15482

1 files changed, 6 insertions, 5 deletions

diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index fcb2d0d8ded..d4b996a0ab6 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -42,11 +42,12 @@ class WebsiteCustomer(http.Controller):
         if country_id:
             domain += [('country_id', '=', country_id)]
             if not any(x['country_id'][0] == country_id for x in countries):
-                country = country_obj.browse(cr, uid, country_id, context)
-                countries.append({
-                    'country_id_count': 0,
-                    'country_id': (country_id, country.name)
-                })
+                country = country_obj.read(cr, uid, country_id, ['name'], context)
+                if country:
+                    countries.append({
+                        'country_id_count': 0,
+                        'country_id': (country_id, country['name'])
+                    })
                 countries.sort(key=lambda d: d['country_id'][1])
 
         countries.insert(0, {