Issue ITTE - 723

Minor changes on the source code formatting. Also caught a case with the
server trying to disconnect a client that couldn't connect at all.