Improved recoverFromMismatchedToken method.
Merge pull request #66 from tonyhuang/errorcode

Improved recoverFromMismatchedToken method.