diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java
index dcc818da4ee..c3700801eae 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java
@@ -157,6 +157,9 @@ public class MakeBuildSettingsTab extends CommonBuildTab {
 		super.initializeFrom(configuration);
 
 		ICBuildConfiguration buildConfig = getBuildConfiguration();
+		if (buildConfig == null) {
+			return;
+		}
 		String container = buildConfig.getProperty(StandardBuildConfiguration.BUILD_CONTAINER);
 		if (container != null && !container.trim().isEmpty()) {
 			IPath containerLoc = new Path(container);
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java
index e58984d8f02..fafcfc3c4b9 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/corebuild/CommonBuildTab.java
@@ -30,7 +30,6 @@ import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
 import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.launchbar.core.target.ILaunchTarget;
 import org.eclipse.launchbar.ui.ILaunchBarLaunchConfigDialog;
-import org.eclipse.launchbar.ui.internal.Activator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -182,7 +181,7 @@ public abstract class CommonBuildTab extends AbstractLaunchConfigurationTab {
 
 	private boolean toolchainChanged() {
 		int i = tcCombo.getSelectionIndex();
-		if (i < 0) {
+		if (i < 0 || toolchains.length == 0) {
 			buildConfig = null;
 			return false;
 		} else if (i == 0) {
@@ -199,7 +198,7 @@ public abstract class CommonBuildTab extends AbstractLaunchConfigurationTab {
 		try {
 			buildConfig = bcManager.getBuildConfiguration(project, newToolchain, mode, new NullProgressMonitor());
 		} catch (CoreException e) {
-			Activator.log(e.getStatus());
+			LaunchUIPlugin.log(e.getStatus());
 		}
 
 		return true;