Add guard for client.lock in upstream steps