It looks like this logic matches that which exists in `ChronosHandler::handle_response`.  Should we be tidying this code up to reduce duplication?