coverity#704562 : Dereference after null check

Change-Id: Icf5e2242f73c519de91508eb912a38b21ac9a9d6
coverity#705785 Dereference before null check

Change-Id: If83916c580c3c6ef64104c4052e87dc4ee168f17