Fix not null asserts