am e519917f: am 396a4d27: am a06c9707: Merge "Add sanity checks to fix crash" into klp-dev

* commit 'e519917f9a3fad675ec887715439a132f1982cdd':
  Add sanity checks to fix crash