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

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