Simplified argument parsing in HandshakeHandler and started sending errors when something is wrong or missing