Provide better error handling, and make the handle_done message clearer.