Add null checks to all mandatory fields