Merge pull request #257 from rickcarlino/master

October 18th
Handle stale tokens with exceptions rather than janky string messages