Fix nullptr segv am: d66ecf171c am: b953d663ea

Change-Id: I383c1f707e07a4bd4ce095e15510ea73058bd956