Add basic checks for not null fields