More not null checks