Error handling clean-up