add retry and update token errors