diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java
index 7c159d991091708618511cc636b8f4728e7ad5c1..215631717d14e7b5c67f3d45562b5d0752d69ba9 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java
@@ -256,6 +256,8 @@ public class SegmentedStoreUtils
                     logger.log(LogLevel.INFO, "Await for data set " + dataSetCode
                             + " to be unlocked.");
                     shareIdManager.await(dataSetCode);
+                    logger.log(LogLevel.INFO, "Start deleting data set " + dataSetCode + " at "
+                            + dataSetDirInStore);
                     FileUtilities.deleteRecursively(dataSetDirInStore);
                     logger.log(LogLevel.INFO, "Data set " + dataSetCode + " at "
                             + dataSetDirInStore + " has been deleted.");
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java
index 31aea1d2f160e48e438912cc219bf5b8e19373bd..32ffaf111cc0fa8206c92c695bbfcc90b979139e 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java
@@ -222,9 +222,12 @@ public class SegmentedStoreUtilsTest extends AbstractFileSystemTestCase
         assertEquals(true, dataSetDirInStore.exists());
         assertFileNames(share2uuid01, "22");
         
-        SegmentedStoreUtils.moveDataSetToAnotherShare(dataSetDirInStore, share2, service, shareIdManager, log);
+        SegmentedStoreUtils.moveDataSetToAnotherShare(dataSetDirInStore, share2, service,
+                shareIdManager, log);
 
         log.assertNextLogMessage("Await for data set ds-1 to be unlocked.");
+        log.assertNextLogMessage("Start deleting data set ds-1 at " + share1
+                + "/uuid/01/02/03/ds-1");
         log.assertNextLogMessage("Data set ds-1 at " + share1
                 + "/uuid/01/02/03/ds-1 has been deleted.");
         assertEquals(false, dataSetDirInStore.exists());