Better handle connection races