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

* commit '0fb33b3c05a0c935e17ae93dbe474f816cec666b':
  Plumb more of the error reporting through.