diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
index 7cf0f58410489aa85623e5540b6728b132cfe98c..2a3f42a995007aba985c147de99047dc568b3e68 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
@@ -155,7 +155,7 @@ public class DataMover
                 createRemotePathMover(readyToMoveStore, outgoingStore);
         final HighwaterMarkDirectoryScanningHandler directoryScanningHandler =
                 new HighwaterMarkDirectoryScanningHandler(new FaultyPathDirectoryScanningHandler(
-                        sourceDirectory), readyToMoveStore.getHighwaterMarkWatcher());
+                        sourceDirectory), outgoingStore.getHighwaterMarkWatcher());
         final DirectoryScanningTimerTask outgoingMovingTask =
                 new DirectoryScanningTimerTask(sourceDirectory, FileUtilities.ACCEPT_ALL_FILTER,
                         remoteStoreMover, directoryScanningHandler);
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java b/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
index 73cd1f62e786f523f83996358270e619026a9aa4..dba7085acf00884c8d225a265bde09cad2ded220 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
@@ -64,7 +64,8 @@ public final class Parameters implements ITimingParameters, IFileSysParameters
 
     static final int DEFAULT_DATA_COMPLETED_SCRIPT_TIMEOUT = 600;
 
-    private final static String HIGHWATER_MARK_TEXT = "(high water mark in KB after the ':')";
+    private final static String HIGHWATER_MARK_TEXT =
+            "(optional high water mark in KB specified after a ':')";
 
     private static final Logger operationLog =
             LogFactory.getLogger(LogCategory.OPERATION, Parameters.class);