Aligned with the new API for errors in the iterator.