am bd28ac74: am 59cea261: Add some sanity checks

* commit 'bd28ac7471e2c7cab0ce9df4c2d5a295adc163a1':
  Add some sanity checks