diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
index 5ed7a2f085a..428df1fe8aa 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
@@ -317,8 +317,10 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 				{
 					dataStore.getDomainNotifier().removeDomainListener(_connectionStatusListener);
 				}
-
-				clientConnection.disconnect();
+				if (clientConnection != null)
+				{
+					clientConnection.disconnect();
+				}
 				
 //				 Fire comm event to signal state changed
 				notifyDisconnection();