am 99355ffb: am 0fb33b3c: Merge "Plumb more of the error reporting through."

* commit '99355ffbdf1bdd097ee1e484d61b1dbb8596276e':
  Plumb more of the error reporting through.