diff --git a/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/LanguageSortedTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/LanguageSortedTableModel.java
index 8db1e6c6ef..53b7c5410a 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/LanguageSortedTableModel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/LanguageSortedTableModel.java
@@ -121,7 +121,7 @@ public class LanguageSortedTableModel extends AbstractSortedTableModel<LanguageC
 	}
 
 	public int getFirstLcsPairIndex(LanguageCompilerSpecPair toFind) {
-		if (languageList != null) {
+		if (toFind != null && languageList != null) {
 			int index = 0;
 			for (LanguageCompilerSpecPair pair : languageList) {
 				if (pair.equals(toFind)) {