--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java	Mon Apr 06 13:59:30 2009 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java	Mon Apr 06 14:33:24 2009 -0500
@@ -799,8 +799,10 @@
 					agentTestTabComposite.layout(true, true);
 				}
 				disposeConnectedService();
-				String buttonLabel = Messages.getString("ConnectionSettingsPage.StartServiceTestButtonLabel"); //$NON-NLS-1$
-				serviceTestButton.setText(buttonLabel);
+				if (!serviceTestButton.isDisposed()) {
+					String buttonLabel = Messages.getString("ConnectionSettingsPage.StartServiceTestButtonLabel"); //$NON-NLS-1$
+					serviceTestButton.setText(buttonLabel);
+				}
 			}
 		});
 	}