am a0e531bb: am 82b05f59: Merge "Handle null stacks gracefully." into klp-dev

* commit 'a0e531bba4716586b17b2cbd99257d1030a974f5':
  Handle null stacks gracefully.