Cleanup + error handling