diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighLanguageProvider.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighLanguageProvider.java
index 62271655df..0176e77225 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighLanguageProvider.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighLanguageProvider.java
@@ -108,24 +108,16 @@ public class SleighLanguageProvider implements LanguageProvider {
 		return failureCount != 0;
 	}
 
-	@Override
-	public Language getLanguage(LanguageID languageId) {
-		Language language = languages.get(languageId);
-		if (language == null) {
-			language = getNewSleigh(languageId);
-		}
-		return language;
-	}
-
 	@Override
 	public boolean isLanguageLoaded(LanguageID languageId) {
 		return languages.get(languageId) != null;
 	}
 
-	private SleighLanguage getNewSleigh(LanguageID languageId) {
+	@Override
+	public Language getLanguage(LanguageID languageId) {
 		SleighLanguageDescription description = descriptions.get(languageId);
 		SleighLanguage lang = languages.get(languageId);
-		if (lang == null) {
+		if (lang == null && description != null) {
 			try {
 				lang = new SleighLanguage(description);
 				languages.put(languageId, lang);