Merge change 25859 into eclair

* changes:
  Improve error-handling when an expected token is missing.