Tighter null checks