Lock disconnect() too