Revert previous change and instead ensure that next() after hasNext() is always safe
2 files changed