Fix NULL pointer dereference am: 6e988ba832 am: 3735317327 am: 490dd170bf
am: c96ae6403c

Change-Id: If938c3560725ff6ce427ca607ccbaaf3ba369878