Finish error handling in Supervisor