REVIEW: Ignore non existing fields

Pending some testing to ensure this actually does what I think it should do.