diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java
index db76b5de98f..3fdb60bd4a3 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java
@@ -163,7 +163,9 @@ public class RemoteFilePropertyChangeListener implements IDomainListener,
 
     public void finish()
     {
-        dataStore.getDomainNotifier().removeDomainListener(this);
+    	if (dataStore != null){
+    		dataStore.getDomainNotifier().removeDomainListener(this);
+    	}
         _finished = true;
     }