only use GrpIterator if its valid
add missing unlink