diff --git a/src/grammar-registry.js b/src/grammar-registry.js
index b442b4693..7d137bebd 100644
--- a/src/grammar-registry.js
+++ b/src/grammar-registry.js
@@ -236,7 +236,7 @@ class GrammarRegistry extends FirstMate.GrammarRegistry {
 
   grammarForLanguageName (languageName) {
     const lowercaseLanguageName = languageName.toLowerCase()
-    return this.getGrammars().find(grammar => grammar.name.toLowerCase() === lowercaseLanguageName)
+    return this.getGrammars().find(({name}) => name && name.toLowerCase() === lowercaseLanguageName)
   }
 
   grammarAddedOrUpdated (grammar) {