Correctly handle fields that are NULL