am f01329d8: Improve error reporting and logging.

* commit 'f01329d8692edde9a9ffb88f29f5d684eab481e2':
  Improve error reporting and logging.