Merge "Bug 2233 - RPC register exception when rpc has no input"