diff --git a/product/Vifib/Tool/SlapTool.py b/product/Vifib/Tool/SlapTool.py
index fdb5fe189da1ea77b078154ac6c43523d5d1195a..03556c4a739be6b5bb76cf0aa15b8c052775e25b 100644
--- a/product/Vifib/Tool/SlapTool.py
+++ b/product/Vifib/Tool/SlapTool.py
@@ -556,10 +556,20 @@ class SlapTool(BaseTool):
 
     In any other case returns not important data and HTTP code is 403 Forbidden
     """
-    shared = xml_marshaller.xml_marshaller.loads(shared_xml)
-    partition_parameter_kw = xml_marshaller.xml_marshaller.loads(
+    if shared_xml:
+      shared = xml_marshaller.xml_marshaller.loads(shared_xml)
+    else:
+      shared = False
+    if partition_parameter_xml:
+      partition_parameter_kw = xml_marshaller.xml_marshaller.loads(
                                               partition_parameter_xml)
-    filter_kw = xml_marshaller.xml_marshaller.loads(filter_xml)
+    else:
+      partition_parameter_kw = dict()
+    if filter_xml:
+      filter_kw = xml_marshaller.xml_marshaller.loads(filter_xml)
+    else:
+      filter_kw = dict()
+      
     instance = etree.Element('instance')
     for parameter_id, parameter_value in partition_parameter_kw.iteritems():
       # cast everything to string