Fixed places that were counting on an error propagation pointing to a
single feature rather than possibly a feature in a feature group.