More RPC changes for SP

NULL pointer check