* Fixed trails for new RPC and avoid NPE during RPC generation