diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
index dbb9a81e8de..3566e8c5271 100644
--- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true
-Bundle-Version: 8.1.0.qualifier
+Bundle-Version: 8.1.100.qualifier
 Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java
index 93115b83626..07471b3fd64 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java
@@ -21,6 +21,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 
+import org.eclipse.cdt.core.model.ILanguage;
 import org.eclipse.cdt.core.model.LanguageManager;
 import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages;
 import org.eclipse.cdt.internal.ui.util.Messages;
@@ -161,7 +162,12 @@ public void refreshMappings() {
 
 			String contentType = entry.getKey();
 			String contentTypeName = contentTypeManager.getContentType(contentType).getName();
-			String languageName = LanguageManager.getInstance().getLanguage(entry.getValue()).getName();
+			String languageKey = entry.getValue();
+			String languageName = languageKey;
+			ILanguage language = LanguageManager.getInstance().getLanguage(languageKey);
+			if (language != null) {
+				languageName = language.getName();
+			}
 
 			if (fOverriddenContentTypes.contains(contentType)) {
 				item.setText(0, Messages.format(PreferencesMessages.ProjectLanguagesPropertyPage_overriddenContentType,