diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractOmniscientTopLevelDataSetRegistrator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractOmniscientTopLevelDataSetRegistrator.java
index 9de75518280ff1d8f5b9bb13c467c1c098a6c7aa..53bf0bec76ac501b2856afd4acbea3a8a44f8dda 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractOmniscientTopLevelDataSetRegistrator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractOmniscientTopLevelDataSetRegistrator.java
@@ -383,8 +383,8 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
                         {
                             return true;
                         }
-                        return state.getMarkerFileUtility().deleteAndLogIsFinishedMarkerFile(
-                                incomingDataSetFileOrIsFinishedFile);
+                        return didOperationSucceed ? state.getMarkerFileUtility().deleteAndLogIsFinishedMarkerFile(
+                                incomingDataSetFileOrIsFinishedFile) : true;
                     }
                 };
         } else