diff --git a/currency.py b/currency.py
index 8e767097ff..9db843abff 100644
--- a/currency.py
+++ b/currency.py
@@ -90,6 +90,8 @@ class Currency(OSV):
         Return the amount to the new currency
         Use the rate of the date of the context or the current date
         '''
+        if context is None:
+            context = {}
         if isinstance(from_currency, (int, long)):
             from_currency = self.browse(cursor, user, from_currency, context=context)
         if isinstance(to_currency, (int, long)):