* Better error handling on double-disconnect