Cleanup promise error handling