Don't re-raise instance

There were a couple of places where the code would re-raise an
exception with `raise inst`. This would lose the original
backtrace.

Change-Id: I437039fe520bd88b556af9ed2ee4a14bfe120498
Merge "Don't re-raise instance"