Make sure null fields are initialized with None