diff --git a/openerp/addons/base/ir/ir_edi.py b/openerp/addons/base/ir/ir_edi.py
index 9672b9a2207..0ee29e13a3a 100644
--- a/openerp/addons/base/ir/ir_edi.py
+++ b/openerp/addons/base/ir/ir_edi.py
@@ -342,6 +342,8 @@ class edi(object):
         
         if context is None:
             context = {}
+        if edi_struct is None:
+            edi_struct = {}
         _fields = self.fields_get(cr, uid, context=context)
         fields_to_export = edi_struct and edi_struct.keys() or _fields.keys()
         edi_dict_list = []