switch to a more capable error class. Remove the token error class (we will deal with it in our client).