diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java
index e48dc6ab7a884d95ab96b4f2710a1d0fcaec33e0..14dbef0b7ff1935a28307351b4ceea59993534f4 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java
@@ -155,7 +155,7 @@ public class Parameters
 
     public Parameters()
     {
-        this(new String[0], SystemExit.SYSTEM_EXIT);
+        this(new String[0], SystemExit.SYSTEM_EXIT, false);
     }
 
     Parameters(final String[] args)
@@ -164,6 +164,11 @@ public class Parameters
     }
 
     Parameters(final String[] args, final IExitHandler systemExitHandler)
+    {
+        this(args, systemExitHandler, true);
+    }
+
+    Parameters(final String[] args, final IExitHandler systemExitHandler, boolean checkParameters)
     {
         try
         {
@@ -176,7 +181,10 @@ public class Parameters
             initCommandLineParametersFromProperties();
 
             parser.parseArgument(args);
-            ensureParametersCorrect();
+            if (checkParameters)
+            {
+                ensureParametersCorrect();
+            }
         } catch (final Exception ex)
         {
             outputException(ex);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/PutDataSetService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/PutDataSetService.java
index 813abd782586cb6fc76f2aed13da06b8869465a2..b2ed54f5b805b2a7a49a5be3e8bcf852ff879048 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/PutDataSetService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/PutDataSetService.java
@@ -105,7 +105,12 @@ class PutDataSetService
  */
 class PutDataSetServiceInitializer
 {
-    private final Parameters params = new Parameters();
+    private final Parameters params;
+
+    PutDataSetServiceInitializer()
+    {
+        params = new Parameters();
+    }
 
     File getIncomingDir()
     {