am 9e72d4e4: am f01329d8: Improve error reporting and logging.

* commit '9e72d4e48a8f00fc911b4b43ebc3b5fe3f3be13b':
  Improve error reporting and logging.