maven warning fix
more robust multiple client handler