am 08c586a5: am 119dcd84: Merge change 25859 into eclair

Merge commit '08c586a507b6b165be164821beea925e730aca99'

* commit '08c586a507b6b165be164821beea925e730aca99':
  Improve error-handling when an expected token is missing.