Added uniformity to the non-existent field handling.