Merge "Don't crash if client token is null."