diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemWizardDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemWizardDialog.java
index 20d5701b56c..4d497d9dcf1 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemWizardDialog.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemWizardDialog.java
@@ -75,7 +75,8 @@ public class SystemWizardDialog extends WizardDialog implements ISystemPromptDia
 		super(shell, wizard);
 		if (wizard instanceof ISystemWizard) {
 			((ISystemWizard)wizard).setSystemWizardDialog(this);
-			setInputObject(inputObject);
+			if (inputObject != null)
+				setInputObject(inputObject);
 		}
 	}