Merge "Fix exception reporting from interpreter"