FIX - Make invalid token a recoverable error.