diff --git a/smithy-aws-apigateway-openapi/src/main/java/software/amazon/smithy/aws/apigateway/openapi/AddIntegrations.java b/smithy-aws-apigateway-openapi/src/main/java/software/amazon/smithy/aws/apigateway/openapi/AddIntegrations.java
index 2e24275c3d5..77a63fbc64b 100644
--- a/smithy-aws-apigateway-openapi/src/main/java/software/amazon/smithy/aws/apigateway/openapi/AddIntegrations.java
+++ b/smithy-aws-apigateway-openapi/src/main/java/software/amazon/smithy/aws/apigateway/openapi/AddIntegrations.java
@@ -132,8 +132,8 @@ private static void validateTraitConfiguration(IntegrationTrait trait,
         ApiGatewayConfig.ApiType apiType = context.getConfig().getExtensions(ApiGatewayConfig.class)
                 .getApiGatewayType();
         if (!trait.getPayloadFormatVersion().isPresent() && apiType.equals(ApiGatewayConfig.ApiType.HTTP)) {
-            throw new OpenApiException("When using the HTTP apiGatewayType, a payloadFormatVersion must be set on the"
-                    + " integration applied to the operation: " + operation.getId());
+            throw new OpenApiException("When the 'apiGatewayType' OpenAPI conversion setting is 'HTTP', a "
+                    + "'payloadFormatVersion' must be set on the aws.apigateway#integration trait.");
         }
     }
 
diff --git a/smithy-aws-apigateway-openapi/src/test/java/software/amazon/smithy/aws/apigateway/openapi/AddIntegrationsTest.java b/smithy-aws-apigateway-openapi/src/test/java/software/amazon/smithy/aws/apigateway/openapi/AddIntegrationsTest.java
index 6ec60402b86..1d3d71e3195 100644
--- a/smithy-aws-apigateway-openapi/src/test/java/software/amazon/smithy/aws/apigateway/openapi/AddIntegrationsTest.java
+++ b/smithy-aws-apigateway-openapi/src/test/java/software/amazon/smithy/aws/apigateway/openapi/AddIntegrationsTest.java
@@ -78,7 +78,7 @@ public void throwsOnInvalidIntegrationTraitForHttpApi() {
             OpenApiConverter.create().config(config).convertToNode(model);
         });
 
-        assertThat(thrown.getMessage(), containsString("a payloadFormatVersion must be set on the integration"
-                    + " applied to the operation:"));
+        assertThat(thrown.getMessage(), containsString("When the 'apiGatewayType' OpenAPI conversion setting is"
+                + " 'HTTP', a 'payloadFormatVersion' must be set on the aws.apigateway#integration trait."));
     }
 }