am d7446564: am 1e5670ab: am 296dc670: am d8e41553: am bd28ac74: am 59cea261: Add some sanity checks

* commit 'd7446564c3e469aea1bba5460ff1fb9441f9fc09':
  Add some sanity checks