Ensured that the iterator.hasNext() get's checked in the notification marker listeners