Added error setting for more cases of invalid tokens.
3 files changed