Better handling of finish of a request.