Fix NULL pointer dereference am: 6e988ba832 am: 3735317327 am: 490dd170bf am: c96ae6403c am: e26d11fd1f am: 9f57b2d447 am: 115c5d36b2 am: 7881d834d2
am: 571f65a3e8

Change-Id: I5cdef72e059c8a68a1bcd1d97222433220b8f2eb