Move error detection/handing to aws_client.