diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
index 4006a8d1e4e..9f47392ef3c 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
@@ -4403,6 +4403,8 @@ public final class DataStore
      */
 	public void setClient(Client client)
 	{
+		// the most likely scenario here is that _client is null since
+		// setClient() is the only way to make the client not null
 		if (client != _client){
 			_client = client;
 			_userPreferencesDirectory = null;