diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 84b05d77ec7..2c7747b4fd7 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -305,7 +305,7 @@ class res_partner_address(osv.osv):
                 if r['name'] and (r['city'] or r['country_id']):
                     addr += ', '
                 addr += (r['country_id'] and r['country_id'][1] or '') + ' ' + (r['city'] or '') + ' '  + (r['street'] or '')
-                if context.get('contact_display', 'contact')=='partner_address':
+                if (context.get('contact_display', 'contact')=='partner_address') and r['partner_id']:
                     res.append((r['id'], "%s: %s" % (r['partner_id'][1], addr.strip() or '/')))
                 else:
                     res.append((r['id'], addr.strip() or '/'))