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