In some cases, validation was done multiple times for the same token

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #455 from Oldiesmann/release-2.1

In some cases, validation was done multiple times for the same token (fixes #128)