Correct the NULL check code block and add NULL check before object access. Change-Id: Ic41b781b41fb4e21bbff8801d500a41a6d7219d0 CRs-fixed: 3084543
Change-Id: I467ece57b82127382f11e48d0dd80e362df0d1c9
Change-Id: I134d6418f1357a4d7ce37358481d6b765d93e1a5