npm - @aws-sdk/client-inspector - Versions diffs - 3.52.0 → 3.53.0 - Mend

@aws-sdk/client-inspector 3.52.0 → 3.53.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/CHANGELOG.md +11 -0
package/dist-cjs/index.js +3 -0
package/dist-cjs/models/InspectorServiceException.js +11 -0
package/dist-cjs/models/models_0.js +166 -3
package/dist-cjs/protocols/Aws_json1_1.js +403 -1415
package/dist-es/index.js +1 -0
package/dist-es/models/InspectorServiceException.js +12 -0
package/dist-es/models/models_0.js +153 -1
package/dist-es/protocols/Aws_json1_1.js +860 -1542
package/dist-types/index.d.ts +1 -0
package/dist-types/models/InspectorServiceException.d.ts +10 -0
package/dist-types/models/models_0.d.ts +79 -72
package/dist-types/ts3.4/index.d.ts +1 -0
package/dist-types/ts3.4/models/InspectorServiceException.d.ts +6 -0
package/dist-types/ts3.4/models/models_0.d.ts +57 -54
package/package.json +25 -25

package/dist-cjs/protocols/Aws_json1_1.js CHANGED Viewed

@@ -4,6 +4,8 @@ exports.deserializeAws_json1_1DescribeExclusionsCommand = exports.deserializeAws
 exports.deserializeAws_json1_1UpdateAssessmentTargetCommand = exports.deserializeAws_json1_1UnsubscribeFromEventCommand = exports.deserializeAws_json1_1SubscribeToEventCommand = exports.deserializeAws_json1_1StopAssessmentRunCommand = exports.deserializeAws_json1_1StartAssessmentRunCommand = exports.deserializeAws_json1_1SetTagsForResourceCommand = exports.deserializeAws_json1_1RemoveAttributesFromFindingsCommand = exports.deserializeAws_json1_1RegisterCrossAccountAccessRoleCommand = exports.deserializeAws_json1_1PreviewAgentsCommand = exports.deserializeAws_json1_1ListTagsForResourceCommand = exports.deserializeAws_json1_1ListRulesPackagesCommand = exports.deserializeAws_json1_1ListFindingsCommand = exports.deserializeAws_json1_1ListExclusionsCommand = exports.deserializeAws_json1_1ListEventSubscriptionsCommand = exports.deserializeAws_json1_1ListAssessmentTemplatesCommand = exports.deserializeAws_json1_1ListAssessmentTargetsCommand = exports.deserializeAws_json1_1ListAssessmentRunsCommand = exports.deserializeAws_json1_1ListAssessmentRunAgentsCommand = exports.deserializeAws_json1_1GetTelemetryMetadataCommand = exports.deserializeAws_json1_1GetExclusionsPreviewCommand = exports.deserializeAws_json1_1GetAssessmentReportCommand = exports.deserializeAws_json1_1DescribeRulesPackagesCommand = exports.deserializeAws_json1_1DescribeResourceGroupsCommand = exports.deserializeAws_json1_1DescribeFindingsCommand = void 0;
 const protocol_http_1 = require("@aws-sdk/protocol-http");
 const smithy_client_1 = require("@aws-sdk/smithy-client");
+const InspectorServiceException_1 = require("../models/InspectorServiceException");
+const models_0_1 = require("../models/models_0");
 const serializeAws_json1_1AddAttributesToFindingsCommand = async (input, context) => {
     const headers = {
         "content-type": "application/x-amz-json-1.1",
@@ -398,59 +400,28 @@ const deserializeAws_json1_1AddAttributesToFindingsCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1CreateAssessmentTargetCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -477,75 +448,34 @@ const deserializeAws_json1_1CreateAssessmentTargetCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidCrossAccountRoleException":
         case "com.amazonaws.inspector#InvalidCrossAccountRoleException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidCrossAccountRoleExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidCrossAccountRoleExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.inspector#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1CreateAssessmentTemplateCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -572,67 +502,31 @@ const deserializeAws_json1_1CreateAssessmentTemplateCommandError = async (output
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.inspector#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1CreateExclusionsPreviewCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -659,67 +553,31 @@ const deserializeAws_json1_1CreateExclusionsPreviewCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "PreviewGenerationInProgressException":
         case "com.amazonaws.inspector#PreviewGenerationInProgressException":
-            response = {
-                ...(await deserializeAws_json1_1PreviewGenerationInProgressExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1PreviewGenerationInProgressExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1CreateResourceGroupCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -746,59 +604,28 @@ const deserializeAws_json1_1CreateResourceGroupCommandError = async (output, con
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.inspector#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DeleteAssessmentRunCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -822,67 +649,31 @@ const deserializeAws_json1_1DeleteAssessmentRunCommandError = async (output, con
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "AssessmentRunInProgressException":
         case "com.amazonaws.inspector#AssessmentRunInProgressException":
-            response = {
-                ...(await deserializeAws_json1_1AssessmentRunInProgressExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AssessmentRunInProgressExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DeleteAssessmentTargetCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -906,67 +697,31 @@ const deserializeAws_json1_1DeleteAssessmentTargetCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "AssessmentRunInProgressException":
         case "com.amazonaws.inspector#AssessmentRunInProgressException":
-            response = {
-                ...(await deserializeAws_json1_1AssessmentRunInProgressExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AssessmentRunInProgressExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DeleteAssessmentTemplateCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -990,67 +745,31 @@ const deserializeAws_json1_1DeleteAssessmentTemplateCommandError = async (output
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "AssessmentRunInProgressException":
         case "com.amazonaws.inspector#AssessmentRunInProgressException":
-            response = {
-                ...(await deserializeAws_json1_1AssessmentRunInProgressExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AssessmentRunInProgressExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DescribeAssessmentRunsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1077,35 +796,19 @@ const deserializeAws_json1_1DescribeAssessmentRunsCommandError = async (output,
     switch (errorCode) {
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DescribeAssessmentTargetsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1132,35 +835,19 @@ const deserializeAws_json1_1DescribeAssessmentTargetsCommandError = async (outpu
     switch (errorCode) {
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DescribeAssessmentTemplatesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1187,35 +874,19 @@ const deserializeAws_json1_1DescribeAssessmentTemplatesCommandError = async (out
     switch (errorCode) {
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DescribeCrossAccountAccessRoleCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1242,27 +913,16 @@ const deserializeAws_json1_1DescribeCrossAccountAccessRoleCommandError = async (
     switch (errorCode) {
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DescribeExclusionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1289,35 +949,19 @@ const deserializeAws_json1_1DescribeExclusionsCommandError = async (output, cont
     switch (errorCode) {
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DescribeFindingsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1344,35 +988,19 @@ const deserializeAws_json1_1DescribeFindingsCommandError = async (output, contex
     switch (errorCode) {
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DescribeResourceGroupsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1399,35 +1027,19 @@ const deserializeAws_json1_1DescribeResourceGroupsCommandError = async (output,
     switch (errorCode) {
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DescribeRulesPackagesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1454,35 +1066,19 @@ const deserializeAws_json1_1DescribeRulesPackagesCommandError = async (output, c
     switch (errorCode) {
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetAssessmentReportCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1509,75 +1105,34 @@ const deserializeAws_json1_1GetAssessmentReportCommandError = async (output, con
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "AssessmentRunInProgressException":
         case "com.amazonaws.inspector#AssessmentRunInProgressException":
-            response = {
-                ...(await deserializeAws_json1_1AssessmentRunInProgressExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AssessmentRunInProgressExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         case "UnsupportedFeatureException":
         case "com.amazonaws.inspector#UnsupportedFeatureException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedFeatureExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedFeatureExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetExclusionsPreviewCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1604,51 +1159,25 @@ const deserializeAws_json1_1GetExclusionsPreviewCommandError = async (output, co
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetTelemetryMetadataCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1675,51 +1204,25 @@ const deserializeAws_json1_1GetTelemetryMetadataCommandError = async (output, co
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListAssessmentRunAgentsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1746,51 +1249,25 @@ const deserializeAws_json1_1ListAssessmentRunAgentsCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListAssessmentRunsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1817,51 +1294,25 @@ const deserializeAws_json1_1ListAssessmentRunsCommandError = async (output, cont
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListAssessmentTargetsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1888,43 +1339,22 @@ const deserializeAws_json1_1ListAssessmentTargetsCommandError = async (output, c
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListAssessmentTemplatesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1951,51 +1381,25 @@ const deserializeAws_json1_1ListAssessmentTemplatesCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListEventSubscriptionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2022,51 +1426,25 @@ const deserializeAws_json1_1ListEventSubscriptionsCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListExclusionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2093,51 +1471,25 @@ const deserializeAws_json1_1ListExclusionsCommandError = async (output, context)
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListFindingsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2164,51 +1516,25 @@ const deserializeAws_json1_1ListFindingsCommandError = async (output, context) =
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListRulesPackagesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2235,43 +1561,22 @@ const deserializeAws_json1_1ListRulesPackagesCommandError = async (output, conte
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListTagsForResourceCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2298,51 +1603,25 @@ const deserializeAws_json1_1ListTagsForResourceCommandError = async (output, con
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1PreviewAgentsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2369,59 +1648,28 @@ const deserializeAws_json1_1PreviewAgentsCommandError = async (output, context)
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidCrossAccountRoleException":
         case "com.amazonaws.inspector#InvalidCrossAccountRoleException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidCrossAccountRoleExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidCrossAccountRoleExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1RegisterCrossAccountAccessRoleCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2445,59 +1693,28 @@ const deserializeAws_json1_1RegisterCrossAccountAccessRoleCommandError = async (
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidCrossAccountRoleException":
         case "com.amazonaws.inspector#InvalidCrossAccountRoleException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidCrossAccountRoleExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidCrossAccountRoleExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1RemoveAttributesFromFindingsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2524,59 +1741,28 @@ const deserializeAws_json1_1RemoveAttributesFromFindingsCommandError = async (ou
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1SetTagsForResourceCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2600,59 +1786,28 @@ const deserializeAws_json1_1SetTagsForResourceCommandError = async (output, cont
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1StartAssessmentRunCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2679,83 +1834,37 @@ const deserializeAws_json1_1StartAssessmentRunCommandError = async (output, cont
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "AgentsAlreadyRunningAssessmentException":
         case "com.amazonaws.inspector#AgentsAlreadyRunningAssessmentException":
-            response = {
-                ...(await deserializeAws_json1_1AgentsAlreadyRunningAssessmentExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AgentsAlreadyRunningAssessmentExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidCrossAccountRoleException":
         case "com.amazonaws.inspector#InvalidCrossAccountRoleException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidCrossAccountRoleExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidCrossAccountRoleExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.inspector#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1StopAssessmentRunCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2779,59 +1888,28 @@ const deserializeAws_json1_1StopAssessmentRunCommandError = async (output, conte
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1SubscribeToEventCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2855,67 +1933,31 @@ const deserializeAws_json1_1SubscribeToEventCommandError = async (output, contex
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.inspector#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1UnsubscribeFromEventCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2939,59 +1981,28 @@ const deserializeAws_json1_1UnsubscribeFromEventCommandError = async (output, co
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1UpdateAssessmentTargetCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3015,180 +2026,127 @@ const deserializeAws_json1_1UpdateAssessmentTargetCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.inspector#InternalException":
-            response = {
-                ...(await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalExceptionResponse(parsedOutput, context);
         case "InvalidInputException":
         case "com.amazonaws.inspector#InvalidInputException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInputExceptionResponse(parsedOutput, context);
         case "NoSuchEntityException":
         case "com.amazonaws.inspector#NoSuchEntityException":
-            response = {
-                ...(await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NoSuchEntityExceptionResponse(parsedOutput, context);
         case "ServiceTemporarilyUnavailableException":
         case "com.amazonaws.inspector#ServiceTemporarilyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new InspectorServiceException_1.InspectorServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1AccessDeniedExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1AccessDeniedException(body, context);
-    const contents = {
-        name: "AccessDeniedException",
-        $fault: "client",
+    const exception = new models_0_1.AccessDeniedException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1AgentsAlreadyRunningAssessmentExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1AgentsAlreadyRunningAssessmentException(body, context);
-    const contents = {
-        name: "AgentsAlreadyRunningAssessmentException",
-        $fault: "client",
+    const exception = new models_0_1.AgentsAlreadyRunningAssessmentException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1AssessmentRunInProgressExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1AssessmentRunInProgressException(body, context);
-    const contents = {
-        name: "AssessmentRunInProgressException",
-        $fault: "client",
+    const exception = new models_0_1.AssessmentRunInProgressException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InternalExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InternalException(body, context);
-    const contents = {
-        name: "InternalException",
-        $fault: "server",
+    const exception = new models_0_1.InternalException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidCrossAccountRoleExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidCrossAccountRoleException(body, context);
-    const contents = {
-        name: "InvalidCrossAccountRoleException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidCrossAccountRoleException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidInputExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidInputException(body, context);
-    const contents = {
-        name: "InvalidInputException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidInputException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1LimitExceededExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1LimitExceededException(body, context);
-    const contents = {
-        name: "LimitExceededException",
-        $fault: "client",
+    const exception = new models_0_1.LimitExceededException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1NoSuchEntityExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1NoSuchEntityException(body, context);
-    const contents = {
-        name: "NoSuchEntityException",
-        $fault: "client",
+    const exception = new models_0_1.NoSuchEntityException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1PreviewGenerationInProgressExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1PreviewGenerationInProgressException(body, context);
-    const contents = {
-        name: "PreviewGenerationInProgressException",
-        $fault: "client",
+    const exception = new models_0_1.PreviewGenerationInProgressException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1ServiceTemporarilyUnavailableExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1ServiceTemporarilyUnavailableException(body, context);
-    const contents = {
-        name: "ServiceTemporarilyUnavailableException",
-        $fault: "server",
+    const exception = new models_0_1.ServiceTemporarilyUnavailableException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1UnsupportedFeatureExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1UnsupportedFeatureException(body, context);
-    const contents = {
-        name: "UnsupportedFeatureException",
-        $fault: "client",
+    const exception = new models_0_1.UnsupportedFeatureException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const serializeAws_json1_1AddAttributesToFindingsRequest = (input, context) => {
     return {
@@ -3811,7 +2769,7 @@ const deserializeAws_json1_1AgentAlreadyRunningAssessment = (output, context) =>
     };
 };
 const deserializeAws_json1_1AgentAlreadyRunningAssessmentList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3819,6 +2777,7 @@ const deserializeAws_json1_1AgentAlreadyRunningAssessmentList = (output, context
         }
         return deserializeAws_json1_1AgentAlreadyRunningAssessment(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AgentPreview = (output, context) => {
     return {
@@ -3833,7 +2792,7 @@ const deserializeAws_json1_1AgentPreview = (output, context) => {
     };
 };
 const deserializeAws_json1_1AgentPreviewList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3841,6 +2800,7 @@ const deserializeAws_json1_1AgentPreviewList = (output, context) => {
         }
         return deserializeAws_json1_1AgentPreview(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AgentsAlreadyRunningAssessmentException = (output, context) => {
     return {
@@ -3853,7 +2813,7 @@ const deserializeAws_json1_1AgentsAlreadyRunningAssessmentException = (output, c
     };
 };
 const deserializeAws_json1_1AssessmentRulesPackageArnList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3861,6 +2821,7 @@ const deserializeAws_json1_1AssessmentRulesPackageArnList = (output, context) =>
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AssessmentRun = (output, context) => {
     return {
@@ -3913,7 +2874,7 @@ const deserializeAws_json1_1AssessmentRunAgent = (output, context) => {
     };
 };
 const deserializeAws_json1_1AssessmentRunAgentList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3921,6 +2882,7 @@ const deserializeAws_json1_1AssessmentRunAgentList = (output, context) => {
         }
         return deserializeAws_json1_1AssessmentRunAgent(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AssessmentRunFindingCounts = (output, context) => {
     return Object.entries(output).reduce((acc, [key, value]) => {
@@ -3934,7 +2896,7 @@ const deserializeAws_json1_1AssessmentRunFindingCounts = (output, context) => {
     }, {});
 };
 const deserializeAws_json1_1AssessmentRunInProgressArnList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3942,6 +2904,7 @@ const deserializeAws_json1_1AssessmentRunInProgressArnList = (output, context) =
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AssessmentRunInProgressException = (output, context) => {
     return {
@@ -3954,7 +2917,7 @@ const deserializeAws_json1_1AssessmentRunInProgressException = (output, context)
     };
 };
 const deserializeAws_json1_1AssessmentRunList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3962,6 +2925,7 @@ const deserializeAws_json1_1AssessmentRunList = (output, context) => {
         }
         return deserializeAws_json1_1AssessmentRun(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AssessmentRunNotification = (output, context) => {
     return {
@@ -3976,7 +2940,7 @@ const deserializeAws_json1_1AssessmentRunNotification = (output, context) => {
     };
 };
 const deserializeAws_json1_1AssessmentRunNotificationList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3984,6 +2948,7 @@ const deserializeAws_json1_1AssessmentRunNotificationList = (output, context) =>
         }
         return deserializeAws_json1_1AssessmentRunNotification(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AssessmentRunStateChange = (output, context) => {
     return {
@@ -3994,7 +2959,7 @@ const deserializeAws_json1_1AssessmentRunStateChange = (output, context) => {
     };
 };
 const deserializeAws_json1_1AssessmentRunStateChangeList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4002,6 +2967,7 @@ const deserializeAws_json1_1AssessmentRunStateChangeList = (output, context) =>
         }
         return deserializeAws_json1_1AssessmentRunStateChange(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AssessmentTarget = (output, context) => {
     return {
@@ -4017,7 +2983,7 @@ const deserializeAws_json1_1AssessmentTarget = (output, context) => {
     };
 };
 const deserializeAws_json1_1AssessmentTargetList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4025,6 +2991,7 @@ const deserializeAws_json1_1AssessmentTargetList = (output, context) => {
         }
         return deserializeAws_json1_1AssessmentTarget(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AssessmentTemplate = (output, context) => {
     return {
@@ -4046,7 +3013,7 @@ const deserializeAws_json1_1AssessmentTemplate = (output, context) => {
     };
 };
 const deserializeAws_json1_1AssessmentTemplateList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4054,9 +3021,10 @@ const deserializeAws_json1_1AssessmentTemplateList = (output, context) => {
         }
         return deserializeAws_json1_1AssessmentTemplate(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AssessmentTemplateRulesPackageArnList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4064,6 +3032,7 @@ const deserializeAws_json1_1AssessmentTemplateRulesPackageArnList = (output, con
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AssetAttributes = (output, context) => {
     return {
@@ -4088,7 +3057,7 @@ const deserializeAws_json1_1Attribute = (output, context) => {
     };
 };
 const deserializeAws_json1_1AttributeList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4096,6 +3065,7 @@ const deserializeAws_json1_1AttributeList = (output, context) => {
         }
         return deserializeAws_json1_1Attribute(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1CreateAssessmentTargetResponse = (output, context) => {
     return {
@@ -4205,7 +3175,7 @@ const deserializeAws_json1_1EventSubscription = (output, context) => {
     };
 };
 const deserializeAws_json1_1EventSubscriptionList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4213,6 +3183,7 @@ const deserializeAws_json1_1EventSubscriptionList = (output, context) => {
         }
         return deserializeAws_json1_1EventSubscription(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1Exclusion = (output, context) => {
     return {
@@ -4253,7 +3224,7 @@ const deserializeAws_json1_1ExclusionPreview = (output, context) => {
     };
 };
 const deserializeAws_json1_1ExclusionPreviewList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4261,6 +3232,7 @@ const deserializeAws_json1_1ExclusionPreviewList = (output, context) => {
         }
         return deserializeAws_json1_1ExclusionPreview(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1FailedItemDetails = (output, context) => {
     return {
@@ -4314,7 +3286,7 @@ const deserializeAws_json1_1Finding = (output, context) => {
     };
 };
 const deserializeAws_json1_1FindingList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4322,6 +3294,7 @@ const deserializeAws_json1_1FindingList = (output, context) => {
         }
         return deserializeAws_json1_1Finding(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1GetAssessmentReportResponse = (output, context) => {
     return {
@@ -4373,7 +3346,7 @@ const deserializeAws_json1_1InvalidInputException = (output, context) => {
     };
 };
 const deserializeAws_json1_1Ipv4AddressList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4381,9 +3354,10 @@ const deserializeAws_json1_1Ipv4AddressList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1Ipv6Addresses = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4391,6 +3365,7 @@ const deserializeAws_json1_1Ipv6Addresses = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1LimitExceededException = (output, context) => {
     return {
@@ -4456,7 +3431,7 @@ const deserializeAws_json1_1ListFindingsResponse = (output, context) => {
     };
 };
 const deserializeAws_json1_1ListReturnedArnList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4464,6 +3439,7 @@ const deserializeAws_json1_1ListReturnedArnList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1ListRulesPackagesResponse = (output, context) => {
     return {
@@ -4501,7 +3477,7 @@ const deserializeAws_json1_1NetworkInterface = (output, context) => {
     };
 };
 const deserializeAws_json1_1NetworkInterfaces = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4509,6 +3485,7 @@ const deserializeAws_json1_1NetworkInterfaces = (output, context) => {
         }
         return deserializeAws_json1_1NetworkInterface(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1NoSuchEntityException = (output, context) => {
     return {
@@ -4537,7 +3514,7 @@ const deserializeAws_json1_1PrivateIp = (output, context) => {
     };
 };
 const deserializeAws_json1_1PrivateIpAddresses = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4545,6 +3522,7 @@ const deserializeAws_json1_1PrivateIpAddresses = (output, context) => {
         }
         return deserializeAws_json1_1PrivateIp(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1RemoveAttributesFromFindingsResponse = (output, context) => {
     return {
@@ -4565,7 +3543,7 @@ const deserializeAws_json1_1ResourceGroup = (output, context) => {
     };
 };
 const deserializeAws_json1_1ResourceGroupList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4573,6 +3551,7 @@ const deserializeAws_json1_1ResourceGroupList = (output, context) => {
         }
         return deserializeAws_json1_1ResourceGroup(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1ResourceGroupTag = (output, context) => {
     return {
@@ -4581,7 +3560,7 @@ const deserializeAws_json1_1ResourceGroupTag = (output, context) => {
     };
 };
 const deserializeAws_json1_1ResourceGroupTags = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4589,6 +3568,7 @@ const deserializeAws_json1_1ResourceGroupTags = (output, context) => {
         }
         return deserializeAws_json1_1ResourceGroupTag(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1RulesPackage = (output, context) => {
     return {
@@ -4600,7 +3580,7 @@ const deserializeAws_json1_1RulesPackage = (output, context) => {
     };
 };
 const deserializeAws_json1_1RulesPackageList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4608,6 +3588,7 @@ const deserializeAws_json1_1RulesPackageList = (output, context) => {
         }
         return deserializeAws_json1_1RulesPackage(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1Scope = (output, context) => {
     return {
@@ -4616,7 +3597,7 @@ const deserializeAws_json1_1Scope = (output, context) => {
     };
 };
 const deserializeAws_json1_1ScopeList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4624,6 +3605,7 @@ const deserializeAws_json1_1ScopeList = (output, context) => {
         }
         return deserializeAws_json1_1Scope(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1SecurityGroup = (output, context) => {
     return {
@@ -4632,7 +3614,7 @@ const deserializeAws_json1_1SecurityGroup = (output, context) => {
     };
 };
 const deserializeAws_json1_1SecurityGroups = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4640,6 +3622,7 @@ const deserializeAws_json1_1SecurityGroups = (output, context) => {
         }
         return deserializeAws_json1_1SecurityGroup(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1ServiceTemporarilyUnavailableException = (output, context) => {
     return {
@@ -4662,7 +3645,7 @@ const deserializeAws_json1_1Subscription = (output, context) => {
     };
 };
 const deserializeAws_json1_1SubscriptionList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4670,6 +3653,7 @@ const deserializeAws_json1_1SubscriptionList = (output, context) => {
         }
         return deserializeAws_json1_1Subscription(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1Tag = (output, context) => {
     return {
@@ -4678,7 +3662,7 @@ const deserializeAws_json1_1Tag = (output, context) => {
     };
 };
 const deserializeAws_json1_1TagList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4686,9 +3670,10 @@ const deserializeAws_json1_1TagList = (output, context) => {
         }
         return deserializeAws_json1_1Tag(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1Tags = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4696,6 +3681,7 @@ const deserializeAws_json1_1Tags = (output, context) => {
         }
         return deserializeAws_json1_1Tag(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1TelemetryMetadata = (output, context) => {
     return {
@@ -4705,7 +3691,7 @@ const deserializeAws_json1_1TelemetryMetadata = (output, context) => {
     };
 };
 const deserializeAws_json1_1TelemetryMetadataList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4713,6 +3699,7 @@ const deserializeAws_json1_1TelemetryMetadataList = (output, context) => {
         }
         return deserializeAws_json1_1TelemetryMetadata(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1UnsupportedFeatureException = (output, context) => {
     return {
@@ -4721,7 +3708,7 @@ const deserializeAws_json1_1UnsupportedFeatureException = (output, context) => {
     };
 };
 const deserializeAws_json1_1UserAttributeList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4729,6 +3716,7 @@ const deserializeAws_json1_1UserAttributeList = (output, context) => {
         }
         return deserializeAws_json1_1Attribute(entry, context);
     });
+    return retVal;
 };
 const deserializeMetadata = (output) => {
     var _a;