fixing tokenservice to handle expired tokens