diff --git a/openerp/addons/base/ir/ir_fields.py b/openerp/addons/base/ir/ir_fields.py
index 417fbc9b4db..65d4a786178 100644
--- a/openerp/addons/base/ir/ir_fields.py
+++ b/openerp/addons/base/ir/ir_fields.py
@@ -168,7 +168,8 @@ class ir_fields_converter(orm.Model):
         raise ValueError(
             _(u"Value '%s' not found in selection field '%%(field)s'") % (
                 value), {
-                'moreinfo': map(operator.itemgetter(1), selection)
+                'moreinfo': [label or unicode(item) for item, label in selection
+                             if label or item]
             })
 
 
diff --git a/openerp/tests/addons/test_impex/models.py b/openerp/tests/addons/test_impex/models.py
index c56ddc649e2..3c85b56fff7 100644
--- a/openerp/tests/addons/test_impex/models.py
+++ b/openerp/tests/addons/test_impex/models.py
@@ -22,7 +22,7 @@ models = [
     ('date', fields.date()),
     ('datetime', fields.datetime()),
     ('text', fields.text()),
-    ('selection', fields.selection([(1, "Foo"), (2, "Bar"), (3, "Qux")])),
+    ('selection', fields.selection([(1, "Foo"), (2, "Bar"), (3, "Qux"), (4, '')])),
     ('selection.function', fields.selection(selection_fn)),
     # just relate to an integer
     ('many2one', fields.many2one('export.integer')),
diff --git a/openerp/tests/addons/test_impex/tests/test_load.py b/openerp/tests/addons/test_impex/tests/test_load.py
index 7657709d24a..18b26a16354 100644
--- a/openerp/tests/addons/test_impex/tests/test_load.py
+++ b/openerp/tests/addons/test_impex/tests/test_load.py
@@ -466,13 +466,13 @@ class test_selection(ImporterCase):
         self.assertIs(result['ids'], False)
         self.assertEqual(result['messages'], [message(
             u"Value 'Baz' not found in selection field 'unknown'",
-            moreinfo="Foo Bar Qux".split())])
+            moreinfo="Foo Bar Qux 4".split())])
 
         result = self.import_(['value'], [[42]])
         self.assertIs(result['ids'], False)
         self.assertEqual(result['messages'], [message(
             u"Value '42' not found in selection field 'unknown'",
-            moreinfo="Foo Bar Qux".split())])
+            moreinfo="Foo Bar Qux 4".split())])
 
 class test_selection_function(ImporterCase):
     model_name = 'export.selection.function'