fix: empty check and iterator validation in ContainerIterator::advance()

fix: empty check and iterator validation in ContainerIterator::advance() #2608