Add pointer check to avoid warning Change-Id: I924a0bdd11daaaa8b21378aab0566b5dba73ca41 CRs-Fixed: 3719443