Simplify missing field handling now that find-field throws

an IllegalArgumentException if the field isn't found