--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Wed Sep 08 17:12:10 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Wed Sep 08 17:13:42 2010 -0500
@@ -211,8 +211,10 @@
 
 	public Collection<String> getCompatibleConnectionTypeIds(IService service) {
 		Collection<String> compatibleConnectionTypeIds = new HashSet<String>();
-		for (IConnectedServiceFactory factory : connectedServiceFactories) {
-			compatibleConnectionTypeIds.addAll(factory.getCompatibleConnectionTypeIds(service));
+		if (service != null) {
+			for (IConnectedServiceFactory factory : connectedServiceFactories) {
+				compatibleConnectionTypeIds.addAll(factory.getCompatibleConnectionTypeIds(service));
+			}
 		}
 		return compatibleConnectionTypeIds;
 	}