--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Tue Dec 29 15:47:09 2009 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Wed Dec 30 09:59:34 2009 -0600
@@ -518,7 +518,12 @@
 	
 	public IConnection ensureConnection(String id, IService service) throws CoreException {
 		Check.checkArg(service);
-		IConnection connection = findConnectionById(id);
+		IConnection connection;
+		if (DEFAULT_CONNECTION_ID.equals(id)) {
+			connection = getDefaultConnection();
+		} else {
+			connection = findConnectionById(id);
+		}
 		if (!isCompatibleConnection(connection, service)) {
 			// TODO ask user to connect a device or cancel
 			throw new CoreException(