Handles expired tokens, closes #29