--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java	Fri Aug 27 16:34:38 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java	Mon Aug 30 10:33:21 2010 -0500
@@ -194,7 +194,9 @@
 	private void refreshViewer() {
 		Display.getDefault().asyncExec(new Runnable() {
 			public void run() {
-				if (nameEditor != null && nameEditor.isActivated()) {
+				if (nameEditor != null && nameEditor.getControl() != null &&
+					!nameEditor.getControl().isDisposed() &&
+					nameEditor.isActivated()) {
 					refreshPending = true;
 					return;
 				}