don't dereference iter when checking for NULL condition
Merge remote-tracking branch 'upstream/master'