diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java
index 880dd284983ea4a01af67bbadddc1213b2f2ebf0..d397ece0ef0c57170e871f6fdad48b1ee53481a9 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java
@@ -162,7 +162,7 @@ public class PutDataSetService
     {
         PutDataSetServiceInitializer initializer = new PutDataSetServiceInitializer();
 
-        incomingDir.mkdir();
+        incomingDir.mkdirs();
 
         pluginMap = initializer.getPluginMap();
         pluginMap.initializeStoreRootDirectory(storeDirectory);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
index 38e3ccdd4f4a19fad6b16f073017f2974cf58d9e..ada1e72e7e2127ef296b57e40b06f31c32e2d7d5 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
@@ -169,7 +169,6 @@ public class DssServiceRpcGeneric extends AbstractDssServiceRpc implements IDssS
     @Override
     public void setIncomingDirectory(File aFile)
     {
-        super.setIncomingDirectory(aFile);
         putService.setIncomingDir(aFile);
     }
 
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
index a2a338bf0cbf3749a7e31c2dd09e8321ae94f2bc..b6770465b6c875ab2c8c93eb5d6ccddbbe3637d2 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
@@ -485,6 +485,8 @@ public class DssServiceRpcV1Test extends AbstractFileSystemTestCase
                         .getPath(), fileInfos));
 
         rpcService.putDataSet(SESSION_TOKEN, newDataSet, fileInputStream);
+
+        context.assertIsSatisfied();
     }
 
     private List<IContent> getContentForFileInfos(String filePath, List<FileInfoDssDTO> fileInfos)