--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Tue Feb 23 08:49:57 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Tue Feb 23 08:53:06 2010 -0600
@@ -517,9 +517,7 @@
 	
 	public ISelectedConnectionInfo ensureConnection(String id, IService service) throws CoreException {
 		Check.checkArg(service);
-		if (id == null)
-			return null;
-		final boolean wasCurrentConnection = id.equals(CURRENT_CONNECTION_ID);
+		final boolean wasCurrentConnection = CURRENT_CONNECTION_ID.equals(id);
 		final IConnection[] connectionHolder = { findConnection(id) };
 		final String[] storableIdHolder = { id };
 		if (!isCompatibleConnection(connectionHolder[0], service)) {