diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
index 7c5a566cefe..074f25d69cd 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
@@ -174,7 +174,10 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab {
 		// Ask the dynamic UI to create its Control
 		getDynamicTab().setLaunchConfigurationDialog(getLaunchConfigurationDialog());
 		getDynamicTab().createControl(getDynamicTabHolder());
-		getDynamicTab().getControl().setVisible(true);
+		Control control = getDynamicTab().getControl();
+		if (control != null) {
+			control.setVisible(true);
+		}
 		getDynamicTabHolder().layout(true);
 		contentsChanged();
 	}