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

* commit '3283ade469f515f89d70cf47b6ac6fe1814147f2':
  Fix exception reporting from interpreter