Fix for null iterators.