diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b632101208f..7c28b578c58 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1593,8 +1593,10 @@ class stock_move(osv.osv):
             except:
                 pass
         if context.get('address_in_id', False):
-            return self.pool.get('res.partner.address').browse(cr, uid, context['address_in_id'], context).partner_id.property_stock_supplier.id
-        return False
+            part_obj_add = self.pool.get('res.partner.address').browse(cr, uid, context['address_in_id'], context=context)
+            if not part_obj_add.partner_id:
+                return False
+            return part_obj_add.partner_id.property_stock_supplier.id
 
     _defaults = {
         'location_id': _default_location_source,