more fixed to expired token error handling