Clean up the old error handling
Clean up the old error handling

terraform-providers/terraform-provider-aws,kjmkznr/terraform-provider-aws,terraform-providers/terraform-provider-aws,kjmkznr/terraform-provider-aws,kjmkznr/terraform-provider-aws,kjmkznr/terraform-provider-aws,terraform-providers/terraform-provider-aws,terraform-providers/terraform-provider-aws