Client: better race condition handling