Add error checks for data client.