diff --git a/formats/cql.py b/formats/cql.py
index <HASH>..<HASH> 100644
--- a/formats/cql.py
+++ b/formats/cql.py
@@ -108,6 +108,8 @@ class TokenExpression(object):
                     attribexprs.append(attribexpr)
                 else:
                     raise SyntaxError("Unexpected char whilst parsing token expression,  position " + str(i) + ": " + s[i])
+        else:
+            raise SyntaxError("Expected token expression starting with either \" or [, got: " + s[i])
 
         if i == len(s):
             interval = None #end of query!
diff --git a/formats/folia.py b/formats/folia.py
index <HASH>..<HASH> 100644
--- a/formats/folia.py
+++ b/formats/folia.py
@@ -600,7 +600,7 @@ class AbstractElement(object):
         return self.text(cls,retaintokenisation=True)
 
     def text(self, cls='current', retaintokenisation=False, previousdelimiter="",strict=False):
-        """Get the text associated with this element (of the specified class), will always be a unicode instance.
+        """Get the text associated with this element (of the specified class)  (will always be a unicode instance in python 2)
 
         The text will be constructed from child-elements whereever possible, as they are more specific.
         If no text can be obtained from the children and the element has itself text associated with
Fixed major CQL parse bug that caused and infinite loop and memory drain on invalid input