Fix conflicts to not crash when NULL is a value in the iterator