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

This should fix the main issue with #128

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>