Resolve sending bug introduced during merge.
Better error output upon RPC error.