--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Thu Jan 14 09:13:44 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Thu Jan 14 09:14:16 2010 -0600
@@ -524,7 +524,11 @@
 	}
 
 	public void setCurrentConnection(IConnection connection) {
-		if (connectionToConnectedServices.keySet().contains(connection)) {
+		if (connection == null) {
+			currentConnection = null; // special case
+			fireCurrentConnectionSet(null);
+		}
+		else if (connectionToConnectedServices.keySet().contains(connection)) {
 			currentConnection = connection;
 			fireCurrentConnectionSet(connection);
 		}