diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
index cdd1eef03e2..a8dfdbd7063 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
@@ -273,7 +273,7 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 		setErrorMessage(null);
 		setMessage(null);
 
-		if (fDCombo.getSelectionIndex() == -1) {
+		if (fDCombo.getSelectionIndex() == -1 || getDebugConfig() == null) {
 			setErrorMessage("No debugger avalible");
 			return false;
 		}
@@ -318,10 +318,10 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 		else {
 			setDynamicTab(CDebugUIPlugin.getDefault().getDebuggerPage(debugConfig.getID()));
 		}
+		setDebugConfig(debugConfig);
 		if (getDynamicTab() == null) {
 			return;
 		}
-		setDebugConfig(debugConfig);
 		// Ask the dynamic UI to create its Control
 		getDynamicTab().setLaunchConfigurationDialog(getLaunchConfigurationDialog());
 		getDynamicTab().createControl(getDynamicTabHolder());