diff --git a/parse.py b/parse.py
index d2a1682..673155e 100644
--- a/parse.py
+++ b/parse.py
@@ -249,7 +249,7 @@
             verb = token.value
         log.log(log.PARSER, log.TRACE, "Parsing statement arguments...")
         if verb:
-            arguments = self.parse_arguments(context, terminator)
+            arguments = self.parse_arguments(meta_context, terminator)
         else:
             arguments = []
         statement = Statement(subject, verb, arguments)
@@ -265,9 +265,10 @@
         if token.type != "symbol":
             raise self.create_error(context, "Expected symbol, got %s" % (token.type))
         subject = token.value
+        context = self.create_context(meta_context, "parsing set separator")
         token = self.next()
         if token.type != "keyword" or token.value != "to":
-            raise self.create_error(meta_context, "Expected To, got %s" % (token))
+            raise self.create_error(context, "Expected To, got %s" % (token.value))
         log.log(log.PARSER, log.TRACE, "Parsing set value...")
         ast = self.parse_statement(meta_context, "endset", "set value")
         set = Set(subject, ast)