moved wrap_rpc/wrap_json non-Error handling to the same module that also handles Errors