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

* commit '296dc6708cbcdc183025500f104defe17380be37':
  Add some sanity checks