@ckarlof, @dannycoates - Are distinct errors for malformed tokens and tokens that would pass validation, but are not staged?

note to self - check it. test it. Make @ryanfeeley  proud.