diff -r 2a78cecf2c2d -r 8eeb96baf835 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java Thu Aug 26 18:02:08 2010 -0500 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java Mon Aug 30 10:31:52 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; }