rpcserver: attempt to fix uncaught exception.
Merge pull request #5565

8db1760 rpcserver: attempt to fix uncaught exception. (Cory Fields)