Moved around some statements in RPCService