errors should display literal if no token name avail.
Merge pull request #621 from parrt/token-names-vs-literals-fix

errors should display literal if no token name avail.