diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index 03202d63a5f..c05fb904f55 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -51,7 +51,7 @@ class WebsiteCustomer(http.Controller):
         if country_id:
             domain += [('country_id', '=', country_id)]
             curr_country = Country.browse(country_id)
-            if country_id not in map(lambda x: x['country_id'][0], countries):
+            if country_id not in (x['country_id'][0] for x in countries if x['country_id']):
                 if curr_country.exists():
                     countries.append({
                         'country_id_count': 0,