Improve reliability with null fields.