am b1d9c4b3: am 3283ade4: Merge "Fix exception reporting from interpreter"

* commit 'b1d9c4b3d8d65c7d00bc7cb5d35f87e84c1b3054':
  Fix exception reporting from interpreter