Fix nullptr segv am: d66ecf171c

Change-Id: Idb6e3befeb8dc159159c209f5982369002af36c1