Merge "RPC registrations should not throw"