diff --git a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ui/TabToolchains.java b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ui/TabToolchains.java
index f2a8404a0..d19d90c3b 100644
--- a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ui/TabToolchains.java
+++ b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ui/TabToolchains.java
@@ -601,8 +601,12 @@ private void updateControlsForConfig(IConfiguration config) {
 		// .println("Previous toolchain name " + fSelectedToolchainName);
 		if (fSelectedToolchainName != null
 				&& fSelectedToolchainName.length() > 0) {
-			fSelectedToolchainIndex = ToolchainDefinition
-					.findToolchainByName(fSelectedToolchainName);
+			try {
+				fSelectedToolchainIndex = ToolchainDefinition
+						.findToolchainByName(fSelectedToolchainName);
+			} catch (IndexOutOfBoundsException e) {
+				fSelectedToolchainIndex = ToolchainDefinition.getDefault();
+			}
 		} else {
 			if (Activator.getInstance().isDebugging()) {
 				System.out.println("No toolchain selected");