diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java
index 1682781dd39..f0322705cea 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java
@@ -657,7 +657,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 
 		// now wait till we have all the bytes local
 		long localBytes = localFile.length();
-		while (localBytes < fileLength && !monitor.isCanceled())
+		while (localBytes < fileLength && (monitor == null || !monitor.isCanceled()))
 		{
 			try
 			{