Adding argument number verification to server and client