Ensure teardown failures are shown, closes #2222