1 files changed, 6 insertions, 0 deletions
diff --git a/ipalib/util.py b/ipalib/util.py
index 12f9c7814..9bc432545 100644
--- a/ipalib/util.py
+++ b/ipalib/util.py
@@ -34,6 +34,12 @@ def xmlrpc_marshal(*args, **kw):
     """
     Marshal (args, kw) into ((kw,) + args).
     """
+    kw = dict(
+        filter(lambda item: item[1] is not None, kw.iteritems())
+    )
+    args = tuple(
+        filter(lambda value: value is not None, args)
+    )
     return ((kw,) + args)