am d8e41553: am bd28ac74: am 59cea261: Add some sanity checks

* commit 'd8e41553b96432c4d4dae80fcc042b95fd9d27d9':
  Add some sanity checks