Add a thicker RPC wrapper + explicitly catch a few connection errors