Better handling of missing fields.