Merge "Fix another nullptr dereference."
am: 331d8e9b1a

Change-Id: If3993e80f5c83bfecb332a8d37997b9a279a5e53