diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
index 9aabfef3da4..99fe20e6ead 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
@@ -98,9 +98,11 @@ public class MBSWizardHandler extends CWizardHandler implements ICBuildWizardHan
 		setWizard(w);
 	}
 	private void setWizard(IWizard w) {
-		if (w.getStartingPage() instanceof IWizardItemsListListener)
-			listener = (IWizardItemsListListener)w.getStartingPage();
-		wizard = w;
+		if (w != null) {
+			if (w.getStartingPage() instanceof IWizardItemsListListener)
+				listener = (IWizardItemsListListener)w.getStartingPage();
+			wizard = w;
+		}
 	}
 	
 	public void handleSelection() {