Add Error Handling in A1 Client