--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceDialog.java	Wed Feb 17 12:57:24 2010 -0800
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceDialog.java	Wed Feb 17 12:59:07 2010 -0800
@@ -196,9 +196,11 @@
 			if (connection != null) {
 				IConnectedService connectedService = null;
 				Collection<IConnectedService> services = manager.getConnectedServices(connection);
-				for (IConnectedService service : services) {
-					if (service != null && service.getService().getIdentifier().equals(data.getService().getIdentifier())) {
-						connectedService = service;
+				if (services != null) {
+					for (IConnectedService service : services) {
+						if (service != null && service.getService().getIdentifier().equals(data.getService().getIdentifier())) {
+							connectedService = service;
+						}
 					}
 				}