Fix for iterate handling null
Newline at end of file