--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/ClientServiceSiteUI2.java	Fri Apr 23 13:46:26 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/ClientServiceSiteUI2.java	Fri Apr 23 13:55:22 2010 -0500
@@ -95,7 +95,7 @@
 			public void selectionChanged(SelectionChangedEvent event) {
 				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
 				String connection = (String) selection.getFirstElement();
-				if (!connection.equals(ClientServiceSiteUI2.this.connection)) {
+				if (connection != null && !connection.equals(ClientServiceSiteUI2.this.connection)) {
 					ClientServiceSiteUI2.this.connection = connection;
 					fireConnectionSelected();
 				}