diff --git a/location.py b/location.py
index da8622909b..c271756cda 100644
--- a/location.py
+++ b/location.py
@@ -152,7 +152,7 @@ class Location(OSV):
             uom_name = uom_obj.name_get(cursor, user, product.default_uom.id,
                     context=context)[0][1]
             return value + ': ' + product_name + ' (' + uom_name + ')'
-        return False
+        return value
 
     def _set_warehouse_parent(self, cursor, user, locations, context=None):
         '''
diff --git a/product.py b/product.py
index 2646a24484..7178aaaea5 100644
--- a/product.py
+++ b/product.py
@@ -468,7 +468,7 @@ class Product(OSV):
     def view_header_get(self, cursor, user, value, view_type='form',
             context=None):
         if not context.get('locations'):
-            return False
+            return value
         location_obj = self.pool.get('stock.location')
         locations = location_obj.browse(cursor, user, context.get('locations'),
                                         context=context)