not raising an exception on a disconnected client
more renamings & style changes