Merge "Add missing exception to log message in SchemaAwareRpcBroker"