Changed GroupedIndex as well for consistency. Back to using KeyNotFoundException as it makes more sense.