am 59cea261: Add some sanity checks

* commit '59cea2616269f34b1f3d046995efd8da42cd5549':
  Add some sanity checks