Add try/catch for some RPC calls