diff --git a/Lib/fontTools/feaLib/parser.py b/Lib/fontTools/feaLib/parser.py
index 3f935e6b0..4a09f2954 100644
--- a/Lib/fontTools/feaLib/parser.py
+++ b/Lib/fontTools/feaLib/parser.py
@@ -92,8 +92,10 @@ class Parser(object):
                         self.cur_token_location_)
                 result.update(gc.glyphs)
             else:
-                raise ParserError("Expected glyph name, range, or reference",
-                                  self.cur_token_location_)
+                raise ParserError(
+                    "Expected glyph name, glyph range, "
+                    "or glyph class reference",
+                    self.cur_token_location_)
         self.expect_symbol_("]")
         return result
 
diff --git a/Lib/fontTools/feaLib/parser_test.py b/Lib/fontTools/feaLib/parser_test.py
index b16341f46..7a34276b7 100644
--- a/Lib/fontTools/feaLib/parser_test.py
+++ b/Lib/fontTools/feaLib/parser_test.py
@@ -26,7 +26,8 @@ class ParserTest(unittest.TestCase):
 
     def test_glyphclass_bad(self):
         self.assertRaisesRegex(
-            ParserError, "Expected glyph name, range, or reference",
+            ParserError,
+            "Expected glyph name, glyph range, or glyph class reference",
             self.parse, "@bad = [a 123];")
 
     def test_glyphclass_duplicate(self):