--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/SettingsWizard.java	Wed Feb 17 12:57:24 2010 -0800
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/SettingsWizard.java	Wed Feb 17 12:59:07 2010 -0800
@@ -139,7 +139,7 @@
 
 	private void saveConnectedServicesEnabledState() {
 		Collection<IConnectedService> connectedServices = Registry.instance().getConnectedServices(connectionToEdit);
-		if (connectedServices.isEmpty())
+		if (connectedServices == null)
 			return;
 		if (savedEnabledStates == null)
 			savedEnabledStates = new HashMap<IConnectedService, Boolean>();
@@ -150,7 +150,7 @@
 
 	private void enableConnectedServices(boolean enabled) {
 		Collection<IConnectedService> connectedServices = Registry.instance().getConnectedServices(connectionToEdit);
-		if (connectedServices.isEmpty() || savedEnabledStates == null)
+		if (connectedServices == null || savedEnabledStates == null)
 			return;
 		for (IConnectedService connectedService : connectedServices) {
 			if (!enabled) // disable when asked