Add exception, change RPC client