@aws-sdk/client-inspector2 3.52.0 → 3.54.1

package/dist-cjs/protocols/Aws_restJson1.js

@@ -5,6 +5,7 @@ exports.deserializeAws_restJson1UpdateOrganizationConfigurationCommand = exports
 const protocol_http_1 = require("@aws-sdk/protocol-http");
 const smithy_client_1 = require("@aws-sdk/smithy-client");
 const uuid_1 = require("uuid");
+const Inspector2ServiceException_1 = require("../models/Inspector2ServiceException");
 const models_0_1 = require("../models/models_0");
 const serializeAws_restJson1AssociateMemberCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
@@ -764,51 +765,25 @@ const deserializeAws_restJson1AssociateMemberCommandError = async (output, conte
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1BatchGetAccountStatusCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -840,59 +815,28 @@ const deserializeAws_restJson1BatchGetAccountStatusCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1BatchGetFreeTrialInfoCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -924,51 +868,25 @@ const deserializeAws_restJson1BatchGetFreeTrialInfoCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1CancelFindingsReportCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -996,59 +914,28 @@ const deserializeAws_restJson1CancelFindingsReportCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1CreateFilterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1076,67 +963,31 @@ const deserializeAws_restJson1CreateFilterCommandError = async (output, context)
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "BadRequestException":
         case "com.amazonaws.inspector2#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ServiceQuotaExceededException":
         case "com.amazonaws.inspector2#ServiceQuotaExceededException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1CreateFindingsReportCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1164,59 +1015,28 @@ const deserializeAws_restJson1CreateFindingsReportCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1DeleteFilterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1244,59 +1064,28 @@ const deserializeAws_restJson1DeleteFilterCommandError = async (output, context)
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1DescribeOrganizationConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1328,51 +1117,25 @@ const deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = as
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1DisableCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1404,59 +1167,28 @@ const deserializeAws_restJson1DisableCommandError = async (output, context) => {
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1DisableDelegatedAdminAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1484,67 +1216,31 @@ const deserializeAws_restJson1DisableDelegatedAdminAccountCommandError = async (
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.inspector2#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1DisassociateMemberCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1572,51 +1268,25 @@ const deserializeAws_restJson1DisassociateMemberCommandError = async (output, co
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1EnableCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1648,59 +1318,28 @@ const deserializeAws_restJson1EnableCommandError = async (output, context) => {
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1EnableDelegatedAdminAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1728,67 +1367,31 @@ const deserializeAws_restJson1EnableDelegatedAdminAccountCommandError = async (o
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.inspector2#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1GetDelegatedAdminAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1816,59 +1419,28 @@ const deserializeAws_restJson1GetDelegatedAdminAccountCommandError = async (outp
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1GetFindingsReportStatusCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1916,59 +1488,28 @@ const deserializeAws_restJson1GetFindingsReportStatusCommandError = async (outpu
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1GetMemberCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1996,59 +1537,28 @@ const deserializeAws_restJson1GetMemberCommandError = async (output, context) =>
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1ListAccountPermissionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2080,51 +1590,25 @@ const deserializeAws_restJson1ListAccountPermissionsCommandError = async (output
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1ListCoverageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2156,43 +1640,22 @@ const deserializeAws_restJson1ListCoverageCommandError = async (output, context)
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1ListCoverageStatisticsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2228,43 +1691,22 @@ const deserializeAws_restJson1ListCoverageStatisticsCommandError = async (output
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1ListDelegatedAdminAccountsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2296,51 +1738,25 @@ const deserializeAws_restJson1ListDelegatedAdminAccountsCommandError = async (ou
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1ListFiltersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2372,51 +1788,25 @@ const deserializeAws_restJson1ListFiltersCommandError = async (output, context)
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1ListFindingAggregationsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2452,43 +1842,22 @@ const deserializeAws_restJson1ListFindingAggregationsCommandError = async (outpu
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1ListFindingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2520,43 +1889,22 @@ const deserializeAws_restJson1ListFindingsCommandError = async (output, context)
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1ListMembersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2588,51 +1936,25 @@ const deserializeAws_restJson1ListMembersCommandError = async (output, context)
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1ListTagsForResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2660,51 +1982,25 @@ const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, c
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1ListUsageTotalsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2736,51 +2032,25 @@ const deserializeAws_restJson1ListUsageTotalsCommandError = async (output, conte
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1TagResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2804,59 +2074,28 @@ const deserializeAws_restJson1TagResourceCommandError = async (output, context)
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.inspector2#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1UntagResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2880,51 +2119,25 @@ const deserializeAws_restJson1UntagResourceCommandError = async (output, context
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1UpdateFilterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2952,59 +2165,28 @@ const deserializeAws_restJson1UpdateFilterCommandError = async (output, context)
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.inspector2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1UpdateOrganizationConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3032,87 +2214,52 @@ const deserializeAws_restJson1UpdateOrganizationConfigurationCommandError = asyn
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.inspector2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.inspector2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.inspector2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.inspector2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(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 Inspector2ServiceException_1.Inspector2ServiceException({
+                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_restJson1AccessDeniedExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "AccessDeniedException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.AccessDeniedException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1BadRequestExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "BadRequestException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.BadRequestException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ConflictException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-        resourceId: undefined,
-        resourceType: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
@@ -3123,17 +2270,14 @@ const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, c
     if (data.resourceType !== undefined && data.resourceType !== null) {
         contents.resourceType = smithy_client_1.expectString(data.resourceType);
     }
-    return contents;
+    const exception = new models_0_1.ConflictException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InternalServerExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "InternalServerException",
-        $fault: "server",
-        $retryable: {},
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-        retryAfterSeconds: undefined,
-    };
+    const contents = {};
     if (parsedOutput.headers["retry-after"] !== undefined) {
         contents.retryAfterSeconds = smithy_client_1.strictParseInt32(parsedOutput.headers["retry-after"]);
     }
@@ -3141,29 +2285,26 @@ const deserializeAws_restJson1InternalServerExceptionResponse = async (parsedOut
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.InternalServerException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ResourceNotFoundException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.ResourceNotFoundException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ServiceQuotaExceededException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-        resourceId: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
@@ -3171,30 +2312,26 @@ const deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = async (par
     if (data.resourceId !== undefined && data.resourceId !== null) {
         contents.resourceId = smithy_client_1.expectString(data.resourceId);
     }
-    return contents;
+    const exception = new models_0_1.ServiceQuotaExceededException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ThrottlingExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ThrottlingException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.ThrottlingException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ValidationExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ValidationException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        fields: undefined,
-        message: undefined,
-        reason: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.fields !== undefined && data.fields !== null) {
         contents.fields = deserializeAws_restJson1ValidationExceptionFields(data.fields, context);
@@ -3205,7 +2342,11 @@ const deserializeAws_restJson1ValidationExceptionResponse = async (parsedOutput,
     if (data.reason !== undefined && data.reason !== null) {
         contents.reason = smithy_client_1.expectString(data.reason);
     }
-    return contents;
+    const exception = new models_0_1.ValidationException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const serializeAws_restJson1AccountAggregation = (input, context) => {
     return {
@@ -3757,7 +2898,7 @@ const deserializeAws_restJson1AccountAggregationResponse = (output, context) =>
     };
 };
 const deserializeAws_restJson1AccountList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3765,6 +2906,7 @@ const deserializeAws_restJson1AccountList = (output, context) => {
         }
         return deserializeAws_restJson1Account(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1AccountState = (output, context) => {
     return {
@@ -3778,7 +2920,7 @@ const deserializeAws_restJson1AccountState = (output, context) => {
     };
 };
 const deserializeAws_restJson1AccountStateList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3786,6 +2928,7 @@ const deserializeAws_restJson1AccountStateList = (output, context) => {
         }
         return deserializeAws_restJson1AccountState(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1AggregationResponse = (output, context) => {
     if (output.accountAggregation !== undefined && output.accountAggregation !== null) {
@@ -3836,7 +2979,7 @@ const deserializeAws_restJson1AggregationResponse = (output, context) => {
     return { $unknown: Object.entries(output)[0] };
 };
 const deserializeAws_restJson1AggregationResponseList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3844,6 +2987,7 @@ const deserializeAws_restJson1AggregationResponseList = (output, context) => {
         }
         return deserializeAws_restJson1AggregationResponse(smithy_client_1.expectUnion(entry), context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1AmiAggregationResponse = (output, context) => {
     return {
@@ -3919,7 +3063,7 @@ const deserializeAws_restJson1Counts = (output, context) => {
     };
 };
 const deserializeAws_restJson1CountsList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3927,6 +3071,7 @@ const deserializeAws_restJson1CountsList = (output, context) => {
         }
         return deserializeAws_restJson1Counts(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1CoveredResource = (output, context) => {
     return {
@@ -3943,7 +3088,7 @@ const deserializeAws_restJson1CoveredResource = (output, context) => {
     };
 };
 const deserializeAws_restJson1CoveredResources = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3951,6 +3096,7 @@ const deserializeAws_restJson1CoveredResources = (output, context) => {
         }
         return deserializeAws_restJson1CoveredResource(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1CvssScore = (output, context) => {
     return {
@@ -3967,7 +3113,7 @@ const deserializeAws_restJson1CvssScoreAdjustment = (output, context) => {
     };
 };
 const deserializeAws_restJson1CvssScoreAdjustmentList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3975,6 +3121,7 @@ const deserializeAws_restJson1CvssScoreAdjustmentList = (output, context) => {
         }
         return deserializeAws_restJson1CvssScoreAdjustment(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1CvssScoreDetails = (output, context) => {
     return {
@@ -3989,7 +3136,7 @@ const deserializeAws_restJson1CvssScoreDetails = (output, context) => {
     };
 };
 const deserializeAws_restJson1CvssScoreList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3997,6 +3144,7 @@ const deserializeAws_restJson1CvssScoreList = (output, context) => {
         }
         return deserializeAws_restJson1CvssScore(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1DateFilter = (output, context) => {
     return {
@@ -4009,7 +3157,7 @@ const deserializeAws_restJson1DateFilter = (output, context) => {
     };
 };
 const deserializeAws_restJson1DateFilterList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4017,6 +3165,7 @@ const deserializeAws_restJson1DateFilterList = (output, context) => {
         }
         return deserializeAws_restJson1DateFilter(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1DelegatedAdmin = (output, context) => {
     return {
@@ -4031,7 +3180,7 @@ const deserializeAws_restJson1DelegatedAdminAccount = (output, context) => {
     };
 };
 const deserializeAws_restJson1DelegatedAdminAccountList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4039,6 +3188,7 @@ const deserializeAws_restJson1DelegatedAdminAccountList = (output, context) => {
         }
         return deserializeAws_restJson1DelegatedAdminAccount(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1Destination = (output, context) => {
     return {
@@ -4096,7 +3246,7 @@ const deserializeAws_restJson1FailedAccount = (output, context) => {
     };
 };
 const deserializeAws_restJson1FailedAccountList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4104,6 +3254,7 @@ const deserializeAws_restJson1FailedAccountList = (output, context) => {
         }
         return deserializeAws_restJson1FailedAccount(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1Filter = (output, context) => {
     return {
@@ -4225,7 +3376,7 @@ const deserializeAws_restJson1FilterCriteria = (output, context) => {
     };
 };
 const deserializeAws_restJson1FilterList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4233,6 +3384,7 @@ const deserializeAws_restJson1FilterList = (output, context) => {
         }
         return deserializeAws_restJson1Filter(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1Finding = (output, context) => {
     return {
@@ -4271,7 +3423,7 @@ const deserializeAws_restJson1Finding = (output, context) => {
     };
 };
 const deserializeAws_restJson1FindingList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4279,6 +3431,7 @@ const deserializeAws_restJson1FindingList = (output, context) => {
         }
         return deserializeAws_restJson1Finding(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1FindingTypeAggregationResponse = (output, context) => {
     return {
@@ -4297,7 +3450,7 @@ const deserializeAws_restJson1FreeTrialAccountInfo = (output, context) => {
     };
 };
 const deserializeAws_restJson1FreeTrialAccountInfoList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4305,6 +3458,7 @@ const deserializeAws_restJson1FreeTrialAccountInfoList = (output, context) => {
         }
         return deserializeAws_restJson1FreeTrialAccountInfo(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1FreeTrialInfo = (output, context) => {
     return {
@@ -4326,7 +3480,7 @@ const deserializeAws_restJson1FreeTrialInfoError = (output, context) => {
     };
 };
 const deserializeAws_restJson1FreeTrialInfoErrorList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4334,9 +3488,10 @@ const deserializeAws_restJson1FreeTrialInfoErrorList = (output, context) => {
         }
         return deserializeAws_restJson1FreeTrialInfoError(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1FreeTrialInfoList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4344,6 +3499,7 @@ const deserializeAws_restJson1FreeTrialInfoList = (output, context) => {
         }
         return deserializeAws_restJson1FreeTrialInfo(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ImageLayerAggregationResponse = (output, context) => {
     return {
@@ -4357,7 +3513,7 @@ const deserializeAws_restJson1ImageLayerAggregationResponse = (output, context)
     };
 };
 const deserializeAws_restJson1ImageTagList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4365,6 +3521,7 @@ const deserializeAws_restJson1ImageTagList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1InspectorScoreDetails = (output, context) => {
     return {
@@ -4374,7 +3531,7 @@ const deserializeAws_restJson1InspectorScoreDetails = (output, context) => {
     };
 };
 const deserializeAws_restJson1IpV4AddressList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4382,9 +3539,10 @@ const deserializeAws_restJson1IpV4AddressList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1IpV6AddressList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4392,6 +3550,7 @@ const deserializeAws_restJson1IpV6AddressList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1MapFilter = (output, context) => {
     return {
@@ -4401,7 +3560,7 @@ const deserializeAws_restJson1MapFilter = (output, context) => {
     };
 };
 const deserializeAws_restJson1MapFilterList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4409,6 +3568,7 @@ const deserializeAws_restJson1MapFilterList = (output, context) => {
         }
         return deserializeAws_restJson1MapFilter(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1Member = (output, context) => {
     return {
@@ -4421,7 +3581,7 @@ const deserializeAws_restJson1Member = (output, context) => {
     };
 };
 const deserializeAws_restJson1MemberList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4429,6 +3589,7 @@ const deserializeAws_restJson1MemberList = (output, context) => {
         }
         return deserializeAws_restJson1Member(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1NetworkPath = (output, context) => {
     return {
@@ -4449,7 +3610,7 @@ const deserializeAws_restJson1NetworkReachabilityDetails = (output, context) =>
     };
 };
 const deserializeAws_restJson1NonEmptyStringList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4457,6 +3618,7 @@ const deserializeAws_restJson1NonEmptyStringList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1NumberFilter = (output, context) => {
     return {
@@ -4465,7 +3627,7 @@ const deserializeAws_restJson1NumberFilter = (output, context) => {
     };
 };
 const deserializeAws_restJson1NumberFilterList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4473,6 +3635,7 @@ const deserializeAws_restJson1NumberFilterList = (output, context) => {
         }
         return deserializeAws_restJson1NumberFilter(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1PackageAggregationResponse = (output, context) => {
     return {
@@ -4506,7 +3669,7 @@ const deserializeAws_restJson1PackageFilter = (output, context) => {
     };
 };
 const deserializeAws_restJson1PackageFilterList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4514,6 +3677,7 @@ const deserializeAws_restJson1PackageFilterList = (output, context) => {
         }
         return deserializeAws_restJson1PackageFilter(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1PackageVulnerabilityDetails = (output, context) => {
     return {
@@ -4548,7 +3712,7 @@ const deserializeAws_restJson1Permission = (output, context) => {
     };
 };
 const deserializeAws_restJson1Permissions = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4556,6 +3720,7 @@ const deserializeAws_restJson1Permissions = (output, context) => {
         }
         return deserializeAws_restJson1Permission(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1PortRange = (output, context) => {
     return {
@@ -4570,7 +3735,7 @@ const deserializeAws_restJson1PortRangeFilter = (output, context) => {
     };
 };
 const deserializeAws_restJson1PortRangeFilterList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4578,6 +3743,7 @@ const deserializeAws_restJson1PortRangeFilterList = (output, context) => {
         }
         return deserializeAws_restJson1PortRangeFilter(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1Recommendation = (output, context) => {
     return {
@@ -4627,7 +3793,7 @@ const deserializeAws_restJson1ResourceDetails = (output, context) => {
     };
 };
 const deserializeAws_restJson1ResourceList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4635,6 +3801,7 @@ const deserializeAws_restJson1ResourceList = (output, context) => {
         }
         return deserializeAws_restJson1Resource(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ResourceScanMetadata = (output, context) => {
     return {
@@ -4689,7 +3856,7 @@ const deserializeAws_restJson1Step = (output, context) => {
     };
 };
 const deserializeAws_restJson1StepList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4697,6 +3864,7 @@ const deserializeAws_restJson1StepList = (output, context) => {
         }
         return deserializeAws_restJson1Step(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1StringFilter = (output, context) => {
     return {
@@ -4705,7 +3873,7 @@ const deserializeAws_restJson1StringFilter = (output, context) => {
     };
 };
 const deserializeAws_restJson1StringFilterList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4713,9 +3881,10 @@ const deserializeAws_restJson1StringFilterList = (output, context) => {
         }
         return deserializeAws_restJson1StringFilter(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1StringList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4723,9 +3892,10 @@ const deserializeAws_restJson1StringList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1TagList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4733,6 +3903,7 @@ const deserializeAws_restJson1TagList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1TagMap = (output, context) => {
     return Object.entries(output).reduce((acc, [key, value]) => {
@@ -4764,7 +3935,7 @@ const deserializeAws_restJson1Usage = (output, context) => {
     };
 };
 const deserializeAws_restJson1UsageList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4772,6 +3943,7 @@ const deserializeAws_restJson1UsageList = (output, context) => {
         }
         return deserializeAws_restJson1Usage(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1UsageTotal = (output, context) => {
     return {
@@ -4782,7 +3954,7 @@ const deserializeAws_restJson1UsageTotal = (output, context) => {
     };
 };
 const deserializeAws_restJson1UsageTotalList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4790,6 +3962,7 @@ const deserializeAws_restJson1UsageTotalList = (output, context) => {
         }
         return deserializeAws_restJson1UsageTotal(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ValidationExceptionField = (output, context) => {
     return {
@@ -4798,7 +3971,7 @@ const deserializeAws_restJson1ValidationExceptionField = (output, context) => {
     };
 };
 const deserializeAws_restJson1ValidationExceptionFields = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4806,9 +3979,10 @@ const deserializeAws_restJson1ValidationExceptionFields = (output, context) => {
         }
         return deserializeAws_restJson1ValidationExceptionField(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1VulnerabilityIdList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4816,6 +3990,7 @@ const deserializeAws_restJson1VulnerabilityIdList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1VulnerablePackage = (output, context) => {
     return {
@@ -4831,7 +4006,7 @@ const deserializeAws_restJson1VulnerablePackage = (output, context) => {
     };
 };
 const deserializeAws_restJson1VulnerablePackageList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4839,6 +4014,7 @@ const deserializeAws_restJson1VulnerablePackageList = (output, context) => {
         }
         return deserializeAws_restJson1VulnerablePackage(entry, context);
     });
+    return retVal;
 };
 const deserializeMetadata = (output) => {
     var _a;