Tolerate AmazonClientException, not just AmazonServiceException

Because of the mockery of the unit tests again :-)