diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java
index 547cbc12420..2c74dac46a7 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java
@@ -385,7 +385,7 @@ public class ImportExecutablePageTwo extends WizardPage {
 		configTypes.setEnabled(isCreateLaunchConfigurationSelected);
 		configurationName.setEnabled(isCreateLaunchConfigurationSelected);
 		configurationNameLabel.setEnabled(isCreateLaunchConfigurationSelected);
-		if (shouldUpdateButtons )
+		if (shouldUpdateButtons && getContainer().getCurrentPage() != null)
 			getContainer().updateButtons();
 	}