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

* commit '1e5670abf9c1b714819ab6ec529a6bc19cbdacf4':
  Add some sanity checks