Add return handshake from server to client. More error checking in client.