diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
index 035dc22b519..9a975ff1235 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
@@ -588,7 +588,10 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 	 * @return resolved ICLanguageSettingEntry
 	 */
 	private ICLanguageSettingEntry resolve(ICLanguageSettingEntry entry) {
-		return CDataUtil.resolveEntries(new ICLanguageSettingEntry[] {entry}, getResDesc().getConfiguration())[0];
+		ICLanguageSettingEntry[] entries = CDataUtil.resolveEntries(new ICLanguageSettingEntry[] {entry}, getResDesc().getConfiguration());
+		if (entries.length > 0)
+			return entries[0];
+		return entry;
 	}
 
 	private void deleteExportSetting(ICSettingEntry ent) {