Extra null checks