Fix #214 Teardown not being called after exception