diff --git a/parse.py b/parse.py
index 8eba8e1..100847d 100644
--- a/parse.py
+++ b/parse.py
@@ -119,13 +119,18 @@
         tokens = []
         (token, line, column) = self.read_token()
         while token:
+            context = ParseContext(None, "reading token", ParseLocation(line, column, self.filename))
             if token == "BeginNote":
                 self.skip_note(line, column)
                 (token, line, column) = self.read_token()
                 continue
+            elif token == "EndNote":
+                raise ParseError(context, "Found stray EndNote")
             elif token == "BeginText":
                 type = "text"
                 value = self.read_text(line, column)
+            elif token == "EndText":
+                raise ParseError(context, "Found stray EndText")
             elif token in ["True", "False"]:
                 type = "bool"
                 value = (token == "True")