Do not return null when no RPC is registered

Change-Id: I6f416440d6a497d17050a1971e9a1eb111483e7a
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Do not return null when no RPC is registered"