diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CNewWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CNewWizard.java
index 872cedb8fb4..104a9c6d113 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CNewWizard.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CNewWizard.java
@@ -44,7 +44,7 @@ public class CNewWizard extends AbstractCWizard {
 		for (int i=0; i<vs.length; i++) {
 			IToolChain[] tcs = ManagedBuildManager.getExtensionsToolChains(ICWizardHandler.ARTIFACT, vs[i].getId());
 			if (tcs == null || tcs.length == 0) continue;
-			MBSWizardHandler h = new MBSWizardHandler(vs[i], IMG1, parent, listener, wizard);
+			MBSWizardHandler h = new MBSWizardHandler(vs[i], IMG1, parent, wizard);
 			for (int j=0; j<tcs.length; j++) {
 				if (!supportedOnly || isValid(tcs[j])) h.addTc(tcs[j]);
 			}
@@ -70,7 +70,7 @@ public class CNewWizard extends AbstractCWizard {
 			if (supportedOnly && !pt.isSupported()) continue; // not supported
 			String nattr = pt.getNameAttribute(); 
 			if (nattr == null || nattr.length() == 0) continue; // new proj style 
-			MBSWizardHandler h = new MBSWizardHandler(pt.getName(), pt, IMG2, parent, listener, wizard);
+			MBSWizardHandler h = new MBSWizardHandler(pt.getName(), pt, IMG2, parent, wizard);
 			IConfiguration[] cfgs = pt.getConfigurations();
 			if (cfgs == null || cfgs.length == 0) continue;
 			IToolChain tc = null;
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 19834507250..c05c50530ff 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
@@ -76,17 +76,19 @@ public class MBSWizardHandler extends CWizardHandler implements ICBuildWizardHan
 	private IToolChain[] savedToolChains = null;
 	private IWizard wizard;
 	
-	public MBSWizardHandler(String _name, IProjectType _pt, Image _image, Composite p, IWizardItemsListListener _listener, IWizard w) {
+	public MBSWizardHandler(String _name, IProjectType _pt, Image _image, Composite p, IWizard w) {
 		super(p, Messages.getString("CWizardHandler.0"), _name, _image); //$NON-NLS-1$
 		pt = _pt;
-		listener = _listener;
+		if (w.getStartingPage() instanceof IWizardItemsListListener)
+			listener = (IWizardItemsListListener)w.getStartingPage();
 		wizard = w;
 	}
 
-	public MBSWizardHandler(IBuildPropertyValue val, Image _image, Composite p, IWizardItemsListListener _listener, IWizard w) {
+	public MBSWizardHandler(IBuildPropertyValue val, Image _image, Composite p, IWizard w) {
 		super(p, Messages.getString("CWizardHandler.0"), val.getName(), _image); //$NON-NLS-1$
 		propertyId = val.getId();
-		listener = _listener;
+		if (w.getStartingPage() instanceof IWizardItemsListListener)
+			listener = (IWizardItemsListListener)w.getStartingPage();
 		wizard = w;
 	}
 	
@@ -200,7 +202,8 @@ public class MBSWizardHandler extends CWizardHandler implements ICBuildWizardHan
 		coreModel.setProjectDescription(project, des);
 		
 		// process custom pages
-		doCustom();
+		if (fConfigPage != null && fConfigPage.pagesLoaded)
+			doCustom();
 	}
 
 	public IWizardPage getSpecificPage() {
@@ -305,7 +308,9 @@ public class MBSWizardHandler extends CWizardHandler implements ICBuildWizardHan
 	
 	private void deleteExtraConfigs(IProject newProject) {
 		if (isChanged()) return; // no need to delete 
-		if (listener.isCurrent()) return; // nothing to delete
+		if (listener != null && listener.isCurrent()) return; // nothing to delete
+		if (fConfigPage == null || !fConfigPage.pagesLoaded) return;
+		
 		ICProjectDescription prjd = CoreModel.getDefault().getProjectDescription(newProject, true);
 		if (prjd == null) return;
 		ICConfigurationDescription[] all = prjd.getConfigurations();
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
index 1ed161da214..1f1e81bdb80 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Composite;
 public class STDWizardHandler extends MBSWizardHandler {
 
 	public STDWizardHandler(String _name, Image _image, Composite p, IWizard w) {
-		super(_name, null, _image, p, null, w);
+		super(_name, null, _image, p, w);
 	}
 
 	public void addTc(IToolChain tc) {