Fix NULL pointer dereference
am: 6e988ba832

Change-Id: Icd2584c97e85c5ad29617654a6609cb4ead61fd3