fixed up server disconnect scenario