TC: Error handling clean-ups