Fix stale client detection w/ in progress client deletions (#535)