Switch-interpreter: Refactor exception handling. am: 8d335b61d6
am: dec7676366

Change-Id: I517cf914a2d22242f589833361eca8e61c7abbca