diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java
index 556d4441290..b103b357946 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java
@@ -132,6 +132,8 @@ public class RSEMainNewConnectionWizard extends Wizard implements INewWizard, IS
 	 * Notify the registered selection changed listener about a changed selection.
 	 */
 	private void fireSelectionChanged() {
+		if (getSelection() == null) return;
+		
 		SelectionChangedEvent event = new SelectionChangedEvent(this, getSelection());
 		Iterator iterator = selectionChangedListener.iterator();
 		while (iterator.hasNext()) {