Fix to prevent logount exceptions when no token;