diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 094a9b2ba6f..ec1bd83dd50 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -37,7 +37,7 @@ class sale_order_line(osv.osv):
         to_cur = self.pool.get('product.pricelist').browse(cr, uid, [pricelist])[0].currency_id.id
         if product:
             product = self.pool['product.product'].browse(cr, uid, product, context=context)
-            purchase_price = product.price_get(ptype='standard_price', context=dict(context, currency_id=to_cur))[product.id]
+            purchase_price = product.standard_price
             to_uom = res.get('product_uom', uom)
             if to_uom != product.uom_id.id:
                 purchase_price = self.pool['product.uom']._compute_price(cr, uid, product.uom_id.id, purchase_price, to_uom)
diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index 65741424d5e..56a9258f0c2 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -354,6 +354,8 @@ class TinyPoFile(object):
                 elif line.startswith('#,') and (line[2:].strip() == 'fuzzy'):
                     fuzzy = True
                 line = self.lines.pop(0).strip()
+            if not self.lines:
+                raise StopIteration()
             while not line:
                 # allow empty lines between comments and msgid
                 line = self.lines.pop(0).strip()