diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/SampleRegisteringDropbox.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/SampleRegisteringDropbox.java
index 65e8cb2c910360e2b84a3fd526620cf579bec07d..052b5458d9e81c4d34f81d973292a50a4fd366a3 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/SampleRegisteringDropbox.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/SampleRegisteringDropbox.java
@@ -92,7 +92,7 @@ public class SampleRegisteringDropbox implements IDataSetHandler
         File logFile = new File(new File(logDir), createErrorLogFileName(file));
         try
         {
-            if (marker.exists())
+            if (marker.exists() || file.getName().endsWith(Constants.ERROR_MARKER_FILE))
             {
                 return createReturnValue();
             }