coverity#1260301 Using invalid iterator

Change-Id: Id3ea2c99026a2d3fea4509b091aa3e352855bc0e