@aws-sdk/client-cloudtrail 3.50.0 → 3.53.0

package/dist-cjs/protocols/Aws_json1_1.js

@@ -4,6 +4,8 @@ exports.deserializeAws_json1_1PutEventSelectorsCommand = exports.deserializeAws_
 exports.deserializeAws_json1_1UpdateTrailCommand = exports.deserializeAws_json1_1UpdateEventDataStoreCommand = exports.deserializeAws_json1_1StopLoggingCommand = exports.deserializeAws_json1_1StartQueryCommand = exports.deserializeAws_json1_1StartLoggingCommand = exports.deserializeAws_json1_1RestoreEventDataStoreCommand = exports.deserializeAws_json1_1RemoveTagsCommand = exports.deserializeAws_json1_1PutInsightSelectorsCommand = void 0;
 const protocol_http_1 = require("@aws-sdk/protocol-http");
 const smithy_client_1 = require("@aws-sdk/smithy-client");
+const CloudTrailServiceException_1 = require("../models/CloudTrailServiceException");
+const models_0_1 = require("../models/models_0");
 const serializeAws_json1_1AddTagsCommand = async (input, context) => {
     const headers = {
         "content-type": "application/x-amz-json-1.1",
@@ -319,115 +321,49 @@ const deserializeAws_json1_1AddTagsCommandError = async (output, context) => {
     switch (errorCode) {
         case "CloudTrailARNInvalidException":
         case "com.amazonaws.cloudtrail#CloudTrailARNInvalidException":
-            response = {
-                ...(await deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.cloudtrail#ConflictException":
-            response = {
-                ...(await deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context);
         case "EventDataStoreNotFoundException":
         case "com.amazonaws.cloudtrail#EventDataStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context);
         case "InactiveEventDataStoreException":
         case "com.amazonaws.cloudtrail#InactiveEventDataStoreException":
-            response = {
-                ...(await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context);
         case "InvalidTagParameterException":
         case "com.amazonaws.cloudtrail#InvalidTagParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context);
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudtrail#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ResourceTypeNotSupportedException":
         case "com.amazonaws.cloudtrail#ResourceTypeNotSupportedException":
-            response = {
-                ...(await deserializeAws_json1_1ResourceTypeNotSupportedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ResourceTypeNotSupportedExceptionResponse(parsedOutput, context);
         case "TagsLimitExceededException":
         case "com.amazonaws.cloudtrail#TagsLimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1TagsLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TagsLimitExceededExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1CancelQueryCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -454,91 +390,40 @@ const deserializeAws_json1_1CancelQueryCommandError = async (output, context) =>
     switch (errorCode) {
         case "ConflictException":
         case "com.amazonaws.cloudtrail#ConflictException":
-            response = {
-                ...(await deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context);
         case "EventDataStoreARNInvalidException":
         case "com.amazonaws.cloudtrail#EventDataStoreARNInvalidException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context);
         case "EventDataStoreNotFoundException":
         case "com.amazonaws.cloudtrail#EventDataStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context);
         case "InactiveEventDataStoreException":
         case "com.amazonaws.cloudtrail#InactiveEventDataStoreException":
-            response = {
-                ...(await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context);
         case "InactiveQueryException":
         case "com.amazonaws.cloudtrail#InactiveQueryException":
-            response = {
-                ...(await deserializeAws_json1_1InactiveQueryExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InactiveQueryExceptionResponse(parsedOutput, context);
         case "InvalidParameterException":
         case "com.amazonaws.cloudtrail#InvalidParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "QueryIdNotFoundException":
         case "com.amazonaws.cloudtrail#QueryIdNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1QueryIdNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1QueryIdNotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1CreateEventDataStoreCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -565,115 +450,49 @@ const deserializeAws_json1_1CreateEventDataStoreCommandError = async (output, co
     switch (errorCode) {
         case "CloudTrailAccessNotEnabledException":
         case "com.amazonaws.cloudtrail#CloudTrailAccessNotEnabledException":
-            response = {
-                ...(await deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.cloudtrail#ConflictException":
-            response = {
-                ...(await deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context);
         case "EventDataStoreAlreadyExistsException":
         case "com.amazonaws.cloudtrail#EventDataStoreAlreadyExistsException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreAlreadyExistsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreAlreadyExistsExceptionResponse(parsedOutput, context);
         case "EventDataStoreMaxLimitExceededException":
         case "com.amazonaws.cloudtrail#EventDataStoreMaxLimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreMaxLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreMaxLimitExceededExceptionResponse(parsedOutput, context);
         case "InsufficientDependencyServiceAccessPermissionException":
         case "com.amazonaws.cloudtrail#InsufficientDependencyServiceAccessPermissionException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context);
         case "InvalidParameterException":
         case "com.amazonaws.cloudtrail#InvalidParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context);
         case "InvalidTagParameterException":
         case "com.amazonaws.cloudtrail#InvalidTagParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "OrganizationNotInAllFeaturesModeException":
         case "com.amazonaws.cloudtrail#OrganizationNotInAllFeaturesModeException":
-            response = {
-                ...(await deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context);
         case "OrganizationsNotInUseException":
         case "com.amazonaws.cloudtrail#OrganizationsNotInUseException":
-            response = {
-                ...(await deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1CreateTrailCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -700,251 +519,100 @@ const deserializeAws_json1_1CreateTrailCommandError = async (output, context) =>
     switch (errorCode) {
         case "CloudTrailAccessNotEnabledException":
         case "com.amazonaws.cloudtrail#CloudTrailAccessNotEnabledException":
-            response = {
-                ...(await deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context);
         case "CloudTrailInvalidClientTokenIdException":
         case "com.amazonaws.cloudtrail#CloudTrailInvalidClientTokenIdException":
-            response = {
-                ...(await deserializeAws_json1_1CloudTrailInvalidClientTokenIdExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudTrailInvalidClientTokenIdExceptionResponse(parsedOutput, context);
         case "CloudWatchLogsDeliveryUnavailableException":
         case "com.amazonaws.cloudtrail#CloudWatchLogsDeliveryUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1CloudWatchLogsDeliveryUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudWatchLogsDeliveryUnavailableExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.cloudtrail#ConflictException":
-            response = {
-                ...(await deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context);
         case "InsufficientDependencyServiceAccessPermissionException":
         case "com.amazonaws.cloudtrail#InsufficientDependencyServiceAccessPermissionException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context);
         case "InsufficientEncryptionPolicyException":
         case "com.amazonaws.cloudtrail#InsufficientEncryptionPolicyException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse(parsedOutput, context);
         case "InsufficientS3BucketPolicyException":
         case "com.amazonaws.cloudtrail#InsufficientS3BucketPolicyException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse(parsedOutput, context);
         case "InsufficientSnsTopicPolicyException":
         case "com.amazonaws.cloudtrail#InsufficientSnsTopicPolicyException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientSnsTopicPolicyExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientSnsTopicPolicyExceptionResponse(parsedOutput, context);
         case "InvalidCloudWatchLogsLogGroupArnException":
         case "com.amazonaws.cloudtrail#InvalidCloudWatchLogsLogGroupArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidCloudWatchLogsLogGroupArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidCloudWatchLogsLogGroupArnExceptionResponse(parsedOutput, context);
         case "InvalidCloudWatchLogsRoleArnException":
         case "com.amazonaws.cloudtrail#InvalidCloudWatchLogsRoleArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidCloudWatchLogsRoleArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidCloudWatchLogsRoleArnExceptionResponse(parsedOutput, context);
         case "InvalidKmsKeyIdException":
         case "com.amazonaws.cloudtrail#InvalidKmsKeyIdException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidKmsKeyIdExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidKmsKeyIdExceptionResponse(parsedOutput, context);
         case "InvalidParameterCombinationException":
         case "com.amazonaws.cloudtrail#InvalidParameterCombinationException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidParameterCombinationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidParameterCombinationExceptionResponse(parsedOutput, context);
         case "InvalidS3BucketNameException":
         case "com.amazonaws.cloudtrail#InvalidS3BucketNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidS3BucketNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidS3BucketNameExceptionResponse(parsedOutput, context);
         case "InvalidS3PrefixException":
         case "com.amazonaws.cloudtrail#InvalidS3PrefixException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidS3PrefixExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidS3PrefixExceptionResponse(parsedOutput, context);
         case "InvalidSnsTopicNameException":
         case "com.amazonaws.cloudtrail#InvalidSnsTopicNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidSnsTopicNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidSnsTopicNameExceptionResponse(parsedOutput, context);
         case "InvalidTagParameterException":
         case "com.amazonaws.cloudtrail#InvalidTagParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context);
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "KmsException":
         case "com.amazonaws.cloudtrail#KmsException":
-            response = {
-                ...(await deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context);
         case "KmsKeyDisabledException":
         case "com.amazonaws.cloudtrail#KmsKeyDisabledException":
-            response = {
-                ...(await deserializeAws_json1_1KmsKeyDisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KmsKeyDisabledExceptionResponse(parsedOutput, context);
         case "KmsKeyNotFoundException":
         case "com.amazonaws.cloudtrail#KmsKeyNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1KmsKeyNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KmsKeyNotFoundExceptionResponse(parsedOutput, context);
         case "MaximumNumberOfTrailsExceededException":
         case "com.amazonaws.cloudtrail#MaximumNumberOfTrailsExceededException":
-            response = {
-                ...(await deserializeAws_json1_1MaximumNumberOfTrailsExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1MaximumNumberOfTrailsExceededExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "OrganizationNotInAllFeaturesModeException":
         case "com.amazonaws.cloudtrail#OrganizationNotInAllFeaturesModeException":
-            response = {
-                ...(await deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context);
         case "OrganizationsNotInUseException":
         case "com.amazonaws.cloudtrail#OrganizationsNotInUseException":
-            response = {
-                ...(await deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context);
         case "S3BucketDoesNotExistException":
         case "com.amazonaws.cloudtrail#S3BucketDoesNotExistException":
-            response = {
-                ...(await deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse(parsedOutput, context);
         case "TrailAlreadyExistsException":
         case "com.amazonaws.cloudtrail#TrailAlreadyExistsException":
-            response = {
-                ...(await deserializeAws_json1_1TrailAlreadyExistsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailAlreadyExistsExceptionResponse(parsedOutput, context);
         case "TrailNotProvidedException":
         case "com.amazonaws.cloudtrail#TrailNotProvidedException":
-            response = {
-                ...(await deserializeAws_json1_1TrailNotProvidedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailNotProvidedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DeleteEventDataStoreCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -971,83 +639,37 @@ const deserializeAws_json1_1DeleteEventDataStoreCommandError = async (output, co
     switch (errorCode) {
         case "EventDataStoreARNInvalidException":
         case "com.amazonaws.cloudtrail#EventDataStoreARNInvalidException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context);
         case "EventDataStoreNotFoundException":
         case "com.amazonaws.cloudtrail#EventDataStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context);
         case "EventDataStoreTerminationProtectedException":
         case "com.amazonaws.cloudtrail#EventDataStoreTerminationProtectedException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreTerminationProtectedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreTerminationProtectedExceptionResponse(parsedOutput, context);
         case "InsufficientDependencyServiceAccessPermissionException":
         case "com.amazonaws.cloudtrail#InsufficientDependencyServiceAccessPermissionException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context);
         case "InvalidParameterException":
         case "com.amazonaws.cloudtrail#InvalidParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DeleteTrailCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1074,83 +696,37 @@ const deserializeAws_json1_1DeleteTrailCommandError = async (output, context) =>
     switch (errorCode) {
         case "ConflictException":
         case "com.amazonaws.cloudtrail#ConflictException":
-            response = {
-                ...(await deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context);
         case "InsufficientDependencyServiceAccessPermissionException":
         case "com.amazonaws.cloudtrail#InsufficientDependencyServiceAccessPermissionException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context);
         case "InvalidHomeRegionException":
         case "com.amazonaws.cloudtrail#InvalidHomeRegionException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context);
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "TrailNotFoundException":
         case "com.amazonaws.cloudtrail#TrailNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DescribeQueryCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1177,75 +753,34 @@ const deserializeAws_json1_1DescribeQueryCommandError = async (output, context)
     switch (errorCode) {
         case "EventDataStoreARNInvalidException":
         case "com.amazonaws.cloudtrail#EventDataStoreARNInvalidException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context);
         case "EventDataStoreNotFoundException":
         case "com.amazonaws.cloudtrail#EventDataStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context);
         case "InactiveEventDataStoreException":
         case "com.amazonaws.cloudtrail#InactiveEventDataStoreException":
-            response = {
-                ...(await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context);
         case "InvalidParameterException":
         case "com.amazonaws.cloudtrail#InvalidParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "QueryIdNotFoundException":
         case "com.amazonaws.cloudtrail#QueryIdNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1QueryIdNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1QueryIdNotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DescribeTrailsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1272,43 +807,22 @@ const deserializeAws_json1_1DescribeTrailsCommandError = async (output, context)
     switch (errorCode) {
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetEventDataStoreCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1335,59 +849,28 @@ const deserializeAws_json1_1GetEventDataStoreCommandError = async (output, conte
     switch (errorCode) {
         case "EventDataStoreARNInvalidException":
         case "com.amazonaws.cloudtrail#EventDataStoreARNInvalidException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context);
         case "EventDataStoreNotFoundException":
         case "com.amazonaws.cloudtrail#EventDataStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context);
         case "InvalidParameterException":
         case "com.amazonaws.cloudtrail#InvalidParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetEventSelectorsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1414,51 +897,25 @@ const deserializeAws_json1_1GetEventSelectorsCommandError = async (output, conte
     switch (errorCode) {
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "TrailNotFoundException":
         case "com.amazonaws.cloudtrail#TrailNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetInsightSelectorsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1485,59 +942,28 @@ const deserializeAws_json1_1GetInsightSelectorsCommandError = async (output, con
     switch (errorCode) {
         case "InsightNotEnabledException":
         case "com.amazonaws.cloudtrail#InsightNotEnabledException":
-            response = {
-                ...(await deserializeAws_json1_1InsightNotEnabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsightNotEnabledExceptionResponse(parsedOutput, context);
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "TrailNotFoundException":
         case "com.amazonaws.cloudtrail#TrailNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetQueryResultsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1564,91 +990,40 @@ const deserializeAws_json1_1GetQueryResultsCommandError = async (output, context
     switch (errorCode) {
         case "EventDataStoreARNInvalidException":
         case "com.amazonaws.cloudtrail#EventDataStoreARNInvalidException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context);
         case "EventDataStoreNotFoundException":
         case "com.amazonaws.cloudtrail#EventDataStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context);
         case "InactiveEventDataStoreException":
         case "com.amazonaws.cloudtrail#InactiveEventDataStoreException":
-            response = {
-                ...(await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context);
         case "InvalidMaxResultsException":
         case "com.amazonaws.cloudtrail#InvalidMaxResultsException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context);
         case "InvalidNextTokenException":
         case "com.amazonaws.cloudtrail#InvalidNextTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context);
         case "InvalidParameterException":
         case "com.amazonaws.cloudtrail#InvalidParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "QueryIdNotFoundException":
         case "com.amazonaws.cloudtrail#QueryIdNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1QueryIdNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1QueryIdNotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetTrailCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1675,51 +1050,25 @@ const deserializeAws_json1_1GetTrailCommandError = async (output, context) => {
     switch (errorCode) {
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "TrailNotFoundException":
         case "com.amazonaws.cloudtrail#TrailNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetTrailStatusCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1746,51 +1095,25 @@ const deserializeAws_json1_1GetTrailStatusCommandError = async (output, context)
     switch (errorCode) {
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "TrailNotFoundException":
         case "com.amazonaws.cloudtrail#TrailNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListEventDataStoresCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1817,51 +1140,25 @@ const deserializeAws_json1_1ListEventDataStoresCommandError = async (output, con
     switch (errorCode) {
         case "InvalidMaxResultsException":
         case "com.amazonaws.cloudtrail#InvalidMaxResultsException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context);
         case "InvalidNextTokenException":
         case "com.amazonaws.cloudtrail#InvalidNextTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListPublicKeysCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1888,51 +1185,25 @@ const deserializeAws_json1_1ListPublicKeysCommandError = async (output, context)
     switch (errorCode) {
         case "InvalidTimeRangeException":
         case "com.amazonaws.cloudtrail#InvalidTimeRangeException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTimeRangeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTimeRangeExceptionResponse(parsedOutput, context);
         case "InvalidTokenException":
         case "com.amazonaws.cloudtrail#InvalidTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTokenExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListQueriesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1959,99 +1230,43 @@ const deserializeAws_json1_1ListQueriesCommandError = async (output, context) =>
     switch (errorCode) {
         case "EventDataStoreARNInvalidException":
         case "com.amazonaws.cloudtrail#EventDataStoreARNInvalidException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context);
         case "EventDataStoreNotFoundException":
         case "com.amazonaws.cloudtrail#EventDataStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context);
         case "InactiveEventDataStoreException":
         case "com.amazonaws.cloudtrail#InactiveEventDataStoreException":
-            response = {
-                ...(await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context);
         case "InvalidDateRangeException":
         case "com.amazonaws.cloudtrail#InvalidDateRangeException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidDateRangeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidDateRangeExceptionResponse(parsedOutput, context);
         case "InvalidMaxResultsException":
         case "com.amazonaws.cloudtrail#InvalidMaxResultsException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context);
         case "InvalidNextTokenException":
         case "com.amazonaws.cloudtrail#InvalidNextTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context);
         case "InvalidParameterException":
         case "com.amazonaws.cloudtrail#InvalidParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context);
         case "InvalidQueryStatusException":
         case "com.amazonaws.cloudtrail#InvalidQueryStatusException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidQueryStatusExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidQueryStatusExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListTagsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2078,91 +1293,40 @@ const deserializeAws_json1_1ListTagsCommandError = async (output, context) => {
     switch (errorCode) {
         case "CloudTrailARNInvalidException":
         case "com.amazonaws.cloudtrail#CloudTrailARNInvalidException":
-            response = {
-                ...(await deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse(parsedOutput, context);
         case "EventDataStoreNotFoundException":
         case "com.amazonaws.cloudtrail#EventDataStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context);
         case "InactiveEventDataStoreException":
         case "com.amazonaws.cloudtrail#InactiveEventDataStoreException":
-            response = {
-                ...(await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context);
         case "InvalidTokenException":
         case "com.amazonaws.cloudtrail#InvalidTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTokenExceptionResponse(parsedOutput, context);
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudtrail#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ResourceTypeNotSupportedException":
         case "com.amazonaws.cloudtrail#ResourceTypeNotSupportedException":
-            response = {
-                ...(await deserializeAws_json1_1ResourceTypeNotSupportedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ResourceTypeNotSupportedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListTrailsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2189,35 +1353,19 @@ const deserializeAws_json1_1ListTrailsCommandError = async (output, context) =>
     switch (errorCode) {
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1LookupEventsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2244,75 +1392,34 @@ const deserializeAws_json1_1LookupEventsCommandError = async (output, context) =
     switch (errorCode) {
         case "InvalidEventCategoryException":
         case "com.amazonaws.cloudtrail#InvalidEventCategoryException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidEventCategoryExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidEventCategoryExceptionResponse(parsedOutput, context);
         case "InvalidLookupAttributesException":
         case "com.amazonaws.cloudtrail#InvalidLookupAttributesException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidLookupAttributesExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidLookupAttributesExceptionResponse(parsedOutput, context);
         case "InvalidMaxResultsException":
         case "com.amazonaws.cloudtrail#InvalidMaxResultsException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context);
         case "InvalidNextTokenException":
         case "com.amazonaws.cloudtrail#InvalidNextTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context);
         case "InvalidTimeRangeException":
         case "com.amazonaws.cloudtrail#InvalidTimeRangeException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTimeRangeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTimeRangeExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1PutEventSelectorsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2339,83 +1446,37 @@ const deserializeAws_json1_1PutEventSelectorsCommandError = async (output, conte
     switch (errorCode) {
         case "InsufficientDependencyServiceAccessPermissionException":
         case "com.amazonaws.cloudtrail#InsufficientDependencyServiceAccessPermissionException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context);
         case "InvalidEventSelectorsException":
         case "com.amazonaws.cloudtrail#InvalidEventSelectorsException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidEventSelectorsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidEventSelectorsExceptionResponse(parsedOutput, context);
         case "InvalidHomeRegionException":
         case "com.amazonaws.cloudtrail#InvalidHomeRegionException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context);
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "TrailNotFoundException":
         case "com.amazonaws.cloudtrail#TrailNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1PutInsightSelectorsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2442,107 +1503,46 @@ const deserializeAws_json1_1PutInsightSelectorsCommandError = async (output, con
     switch (errorCode) {
         case "InsufficientEncryptionPolicyException":
         case "com.amazonaws.cloudtrail#InsufficientEncryptionPolicyException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse(parsedOutput, context);
         case "InsufficientS3BucketPolicyException":
         case "com.amazonaws.cloudtrail#InsufficientS3BucketPolicyException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse(parsedOutput, context);
         case "InvalidHomeRegionException":
         case "com.amazonaws.cloudtrail#InvalidHomeRegionException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context);
         case "InvalidInsightSelectorsException":
         case "com.amazonaws.cloudtrail#InvalidInsightSelectorsException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidInsightSelectorsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidInsightSelectorsExceptionResponse(parsedOutput, context);
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "KmsException":
         case "com.amazonaws.cloudtrail#KmsException":
-            response = {
-                ...(await deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "S3BucketDoesNotExistException":
         case "com.amazonaws.cloudtrail#S3BucketDoesNotExistException":
-            response = {
-                ...(await deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse(parsedOutput, context);
         case "TrailNotFoundException":
         case "com.amazonaws.cloudtrail#TrailNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1RemoveTagsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2569,99 +1569,43 @@ const deserializeAws_json1_1RemoveTagsCommandError = async (output, context) =>
     switch (errorCode) {
         case "CloudTrailARNInvalidException":
         case "com.amazonaws.cloudtrail#CloudTrailARNInvalidException":
-            response = {
-                ...(await deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse(parsedOutput, context);
         case "EventDataStoreNotFoundException":
         case "com.amazonaws.cloudtrail#EventDataStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context);
         case "InactiveEventDataStoreException":
         case "com.amazonaws.cloudtrail#InactiveEventDataStoreException":
-            response = {
-                ...(await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context);
         case "InvalidTagParameterException":
         case "com.amazonaws.cloudtrail#InvalidTagParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context);
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.cloudtrail#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ResourceTypeNotSupportedException":
         case "com.amazonaws.cloudtrail#ResourceTypeNotSupportedException":
-            response = {
-                ...(await deserializeAws_json1_1ResourceTypeNotSupportedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ResourceTypeNotSupportedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1RestoreEventDataStoreCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2688,115 +1632,49 @@ const deserializeAws_json1_1RestoreEventDataStoreCommandError = async (output, c
     switch (errorCode) {
         case "CloudTrailAccessNotEnabledException":
         case "com.amazonaws.cloudtrail#CloudTrailAccessNotEnabledException":
-            response = {
-                ...(await deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context);
         case "EventDataStoreARNInvalidException":
         case "com.amazonaws.cloudtrail#EventDataStoreARNInvalidException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context);
         case "EventDataStoreMaxLimitExceededException":
         case "com.amazonaws.cloudtrail#EventDataStoreMaxLimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreMaxLimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreMaxLimitExceededExceptionResponse(parsedOutput, context);
         case "EventDataStoreNotFoundException":
         case "com.amazonaws.cloudtrail#EventDataStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context);
         case "InsufficientDependencyServiceAccessPermissionException":
         case "com.amazonaws.cloudtrail#InsufficientDependencyServiceAccessPermissionException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context);
         case "InvalidEventDataStoreStatusException":
         case "com.amazonaws.cloudtrail#InvalidEventDataStoreStatusException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidEventDataStoreStatusExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidEventDataStoreStatusExceptionResponse(parsedOutput, context);
         case "InvalidParameterException":
         case "com.amazonaws.cloudtrail#InvalidParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "OrganizationNotInAllFeaturesModeException":
         case "com.amazonaws.cloudtrail#OrganizationNotInAllFeaturesModeException":
-            response = {
-                ...(await deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context);
         case "OrganizationsNotInUseException":
         case "com.amazonaws.cloudtrail#OrganizationsNotInUseException":
-            response = {
-                ...(await deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1StartLoggingCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2823,75 +1701,34 @@ const deserializeAws_json1_1StartLoggingCommandError = async (output, context) =
     switch (errorCode) {
         case "InsufficientDependencyServiceAccessPermissionException":
         case "com.amazonaws.cloudtrail#InsufficientDependencyServiceAccessPermissionException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context);
         case "InvalidHomeRegionException":
         case "com.amazonaws.cloudtrail#InvalidHomeRegionException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context);
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "TrailNotFoundException":
         case "com.amazonaws.cloudtrail#TrailNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1StartQueryCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2918,83 +1755,37 @@ const deserializeAws_json1_1StartQueryCommandError = async (output, context) =>
     switch (errorCode) {
         case "EventDataStoreARNInvalidException":
         case "com.amazonaws.cloudtrail#EventDataStoreARNInvalidException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context);
         case "EventDataStoreNotFoundException":
         case "com.amazonaws.cloudtrail#EventDataStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context);
         case "InactiveEventDataStoreException":
         case "com.amazonaws.cloudtrail#InactiveEventDataStoreException":
-            response = {
-                ...(await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context);
         case "InvalidParameterException":
         case "com.amazonaws.cloudtrail#InvalidParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context);
         case "InvalidQueryStatementException":
         case "com.amazonaws.cloudtrail#InvalidQueryStatementException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidQueryStatementExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidQueryStatementExceptionResponse(parsedOutput, context);
         case "MaxConcurrentQueriesException":
         case "com.amazonaws.cloudtrail#MaxConcurrentQueriesException":
-            response = {
-                ...(await deserializeAws_json1_1MaxConcurrentQueriesExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1MaxConcurrentQueriesExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1StopLoggingCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3021,75 +1812,34 @@ const deserializeAws_json1_1StopLoggingCommandError = async (output, context) =>
     switch (errorCode) {
         case "InsufficientDependencyServiceAccessPermissionException":
         case "com.amazonaws.cloudtrail#InsufficientDependencyServiceAccessPermissionException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context);
         case "InvalidHomeRegionException":
         case "com.amazonaws.cloudtrail#InvalidHomeRegionException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context);
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "TrailNotFoundException":
         case "com.amazonaws.cloudtrail#TrailNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1UpdateEventDataStoreCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3116,107 +1866,46 @@ const deserializeAws_json1_1UpdateEventDataStoreCommandError = async (output, co
     switch (errorCode) {
         case "CloudTrailAccessNotEnabledException":
         case "com.amazonaws.cloudtrail#CloudTrailAccessNotEnabledException":
-            response = {
-                ...(await deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context);
         case "EventDataStoreARNInvalidException":
         case "com.amazonaws.cloudtrail#EventDataStoreARNInvalidException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context);
         case "EventDataStoreNotFoundException":
         case "com.amazonaws.cloudtrail#EventDataStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context);
         case "InactiveEventDataStoreException":
         case "com.amazonaws.cloudtrail#InactiveEventDataStoreException":
-            response = {
-                ...(await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context);
         case "InsufficientDependencyServiceAccessPermissionException":
         case "com.amazonaws.cloudtrail#InsufficientDependencyServiceAccessPermissionException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context);
         case "InvalidParameterException":
         case "com.amazonaws.cloudtrail#InvalidParameterException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "OrganizationNotInAllFeaturesModeException":
         case "com.amazonaws.cloudtrail#OrganizationNotInAllFeaturesModeException":
-            response = {
-                ...(await deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context);
         case "OrganizationsNotInUseException":
         case "com.amazonaws.cloudtrail#OrganizationsNotInUseException":
-            response = {
-                ...(await deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1UpdateTrailCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3243,881 +1932,619 @@ const deserializeAws_json1_1UpdateTrailCommandError = async (output, context) =>
     switch (errorCode) {
         case "CloudTrailAccessNotEnabledException":
         case "com.amazonaws.cloudtrail#CloudTrailAccessNotEnabledException":
-            response = {
-                ...(await deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context);
         case "CloudTrailInvalidClientTokenIdException":
         case "com.amazonaws.cloudtrail#CloudTrailInvalidClientTokenIdException":
-            response = {
-                ...(await deserializeAws_json1_1CloudTrailInvalidClientTokenIdExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudTrailInvalidClientTokenIdExceptionResponse(parsedOutput, context);
         case "CloudWatchLogsDeliveryUnavailableException":
         case "com.amazonaws.cloudtrail#CloudWatchLogsDeliveryUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1CloudWatchLogsDeliveryUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudWatchLogsDeliveryUnavailableExceptionResponse(parsedOutput, context);
         case "InsufficientDependencyServiceAccessPermissionException":
         case "com.amazonaws.cloudtrail#InsufficientDependencyServiceAccessPermissionException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context);
         case "InsufficientEncryptionPolicyException":
         case "com.amazonaws.cloudtrail#InsufficientEncryptionPolicyException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse(parsedOutput, context);
         case "InsufficientS3BucketPolicyException":
         case "com.amazonaws.cloudtrail#InsufficientS3BucketPolicyException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse(parsedOutput, context);
         case "InsufficientSnsTopicPolicyException":
         case "com.amazonaws.cloudtrail#InsufficientSnsTopicPolicyException":
-            response = {
-                ...(await deserializeAws_json1_1InsufficientSnsTopicPolicyExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InsufficientSnsTopicPolicyExceptionResponse(parsedOutput, context);
         case "InvalidCloudWatchLogsLogGroupArnException":
         case "com.amazonaws.cloudtrail#InvalidCloudWatchLogsLogGroupArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidCloudWatchLogsLogGroupArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidCloudWatchLogsLogGroupArnExceptionResponse(parsedOutput, context);
         case "InvalidCloudWatchLogsRoleArnException":
         case "com.amazonaws.cloudtrail#InvalidCloudWatchLogsRoleArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidCloudWatchLogsRoleArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidCloudWatchLogsRoleArnExceptionResponse(parsedOutput, context);
         case "InvalidEventSelectorsException":
         case "com.amazonaws.cloudtrail#InvalidEventSelectorsException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidEventSelectorsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidEventSelectorsExceptionResponse(parsedOutput, context);
         case "InvalidHomeRegionException":
         case "com.amazonaws.cloudtrail#InvalidHomeRegionException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context);
         case "InvalidKmsKeyIdException":
         case "com.amazonaws.cloudtrail#InvalidKmsKeyIdException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidKmsKeyIdExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidKmsKeyIdExceptionResponse(parsedOutput, context);
         case "InvalidParameterCombinationException":
         case "com.amazonaws.cloudtrail#InvalidParameterCombinationException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidParameterCombinationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidParameterCombinationExceptionResponse(parsedOutput, context);
         case "InvalidS3BucketNameException":
         case "com.amazonaws.cloudtrail#InvalidS3BucketNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidS3BucketNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidS3BucketNameExceptionResponse(parsedOutput, context);
         case "InvalidS3PrefixException":
         case "com.amazonaws.cloudtrail#InvalidS3PrefixException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidS3PrefixExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidS3PrefixExceptionResponse(parsedOutput, context);
         case "InvalidSnsTopicNameException":
         case "com.amazonaws.cloudtrail#InvalidSnsTopicNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidSnsTopicNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidSnsTopicNameExceptionResponse(parsedOutput, context);
         case "InvalidTrailNameException":
         case "com.amazonaws.cloudtrail#InvalidTrailNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context);
         case "KmsException":
         case "com.amazonaws.cloudtrail#KmsException":
-            response = {
-                ...(await deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context);
         case "KmsKeyDisabledException":
         case "com.amazonaws.cloudtrail#KmsKeyDisabledException":
-            response = {
-                ...(await deserializeAws_json1_1KmsKeyDisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KmsKeyDisabledExceptionResponse(parsedOutput, context);
         case "KmsKeyNotFoundException":
         case "com.amazonaws.cloudtrail#KmsKeyNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1KmsKeyNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KmsKeyNotFoundExceptionResponse(parsedOutput, context);
         case "NotOrganizationMasterAccountException":
         case "com.amazonaws.cloudtrail#NotOrganizationMasterAccountException":
-            response = {
-                ...(await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context);
         case "OperationNotPermittedException":
         case "com.amazonaws.cloudtrail#OperationNotPermittedException":
-            response = {
-                ...(await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context);
         case "OrganizationNotInAllFeaturesModeException":
         case "com.amazonaws.cloudtrail#OrganizationNotInAllFeaturesModeException":
-            response = {
-                ...(await deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context);
         case "OrganizationsNotInUseException":
         case "com.amazonaws.cloudtrail#OrganizationsNotInUseException":
-            response = {
-                ...(await deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context);
         case "S3BucketDoesNotExistException":
         case "com.amazonaws.cloudtrail#S3BucketDoesNotExistException":
-            response = {
-                ...(await deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse(parsedOutput, context);
         case "TrailNotFoundException":
         case "com.amazonaws.cloudtrail#TrailNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context);
         case "TrailNotProvidedException":
         case "com.amazonaws.cloudtrail#TrailNotProvidedException":
-            response = {
-                ...(await deserializeAws_json1_1TrailNotProvidedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TrailNotProvidedExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.cloudtrail#UnsupportedOperationException":
-            response = {
-                ...(await deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1UnsupportedOperationExceptionResponse(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 CloudTrailServiceException_1.CloudTrailServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CloudTrailAccessNotEnabledException(body, context);
-    const contents = {
-        name: "CloudTrailAccessNotEnabledException",
-        $fault: "client",
+    const exception = new models_0_1.CloudTrailAccessNotEnabledException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CloudTrailARNInvalidException(body, context);
-    const contents = {
-        name: "CloudTrailARNInvalidException",
-        $fault: "client",
+    const exception = new models_0_1.CloudTrailARNInvalidException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1CloudTrailInvalidClientTokenIdExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CloudTrailInvalidClientTokenIdException(body, context);
-    const contents = {
-        name: "CloudTrailInvalidClientTokenIdException",
-        $fault: "client",
+    const exception = new models_0_1.CloudTrailInvalidClientTokenIdException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1CloudWatchLogsDeliveryUnavailableExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CloudWatchLogsDeliveryUnavailableException(body, context);
-    const contents = {
-        name: "CloudWatchLogsDeliveryUnavailableException",
-        $fault: "client",
+    const exception = new models_0_1.CloudWatchLogsDeliveryUnavailableException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1ConflictExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1ConflictException(body, context);
-    const contents = {
-        name: "ConflictException",
-        $fault: "client",
+    const exception = new models_0_1.ConflictException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1EventDataStoreAlreadyExistsExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1EventDataStoreAlreadyExistsException(body, context);
-    const contents = {
-        name: "EventDataStoreAlreadyExistsException",
-        $fault: "client",
+    const exception = new models_0_1.EventDataStoreAlreadyExistsException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1EventDataStoreARNInvalidException(body, context);
-    const contents = {
-        name: "EventDataStoreARNInvalidException",
-        $fault: "client",
+    const exception = new models_0_1.EventDataStoreARNInvalidException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1EventDataStoreMaxLimitExceededExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1EventDataStoreMaxLimitExceededException(body, context);
-    const contents = {
-        name: "EventDataStoreMaxLimitExceededException",
-        $fault: "client",
+    const exception = new models_0_1.EventDataStoreMaxLimitExceededException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1EventDataStoreNotFoundException(body, context);
-    const contents = {
-        name: "EventDataStoreNotFoundException",
-        $fault: "client",
+    const exception = new models_0_1.EventDataStoreNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1EventDataStoreTerminationProtectedExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1EventDataStoreTerminationProtectedException(body, context);
-    const contents = {
-        name: "EventDataStoreTerminationProtectedException",
-        $fault: "client",
+    const exception = new models_0_1.EventDataStoreTerminationProtectedException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InactiveEventDataStoreExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InactiveEventDataStoreException(body, context);
-    const contents = {
-        name: "InactiveEventDataStoreException",
-        $fault: "client",
+    const exception = new models_0_1.InactiveEventDataStoreException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InactiveQueryExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InactiveQueryException(body, context);
-    const contents = {
-        name: "InactiveQueryException",
-        $fault: "client",
+    const exception = new models_0_1.InactiveQueryException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InsightNotEnabledExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InsightNotEnabledException(body, context);
-    const contents = {
-        name: "InsightNotEnabledException",
-        $fault: "client",
+    const exception = new models_0_1.InsightNotEnabledException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionException(body, context);
-    const contents = {
-        name: "InsufficientDependencyServiceAccessPermissionException",
-        $fault: "client",
+    const exception = new models_0_1.InsufficientDependencyServiceAccessPermissionException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InsufficientEncryptionPolicyException(body, context);
-    const contents = {
-        name: "InsufficientEncryptionPolicyException",
-        $fault: "client",
+    const exception = new models_0_1.InsufficientEncryptionPolicyException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InsufficientS3BucketPolicyException(body, context);
-    const contents = {
-        name: "InsufficientS3BucketPolicyException",
-        $fault: "client",
+    const exception = new models_0_1.InsufficientS3BucketPolicyException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InsufficientSnsTopicPolicyExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InsufficientSnsTopicPolicyException(body, context);
-    const contents = {
-        name: "InsufficientSnsTopicPolicyException",
-        $fault: "client",
+    const exception = new models_0_1.InsufficientSnsTopicPolicyException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidCloudWatchLogsLogGroupArnExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidCloudWatchLogsLogGroupArnException(body, context);
-    const contents = {
-        name: "InvalidCloudWatchLogsLogGroupArnException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidCloudWatchLogsLogGroupArnException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidCloudWatchLogsRoleArnExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidCloudWatchLogsRoleArnException(body, context);
-    const contents = {
-        name: "InvalidCloudWatchLogsRoleArnException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidCloudWatchLogsRoleArnException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidDateRangeExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidDateRangeException(body, context);
-    const contents = {
-        name: "InvalidDateRangeException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidDateRangeException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidEventCategoryExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidEventCategoryException(body, context);
-    const contents = {
-        name: "InvalidEventCategoryException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidEventCategoryException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidEventDataStoreStatusExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidEventDataStoreStatusException(body, context);
-    const contents = {
-        name: "InvalidEventDataStoreStatusException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidEventDataStoreStatusException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidEventSelectorsExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidEventSelectorsException(body, context);
-    const contents = {
-        name: "InvalidEventSelectorsException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidEventSelectorsException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidHomeRegionExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidHomeRegionException(body, context);
-    const contents = {
-        name: "InvalidHomeRegionException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidHomeRegionException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidInsightSelectorsExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidInsightSelectorsException(body, context);
-    const contents = {
-        name: "InvalidInsightSelectorsException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidInsightSelectorsException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidKmsKeyIdExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidKmsKeyIdException(body, context);
-    const contents = {
-        name: "InvalidKmsKeyIdException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidKmsKeyIdException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidLookupAttributesExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidLookupAttributesException(body, context);
-    const contents = {
-        name: "InvalidLookupAttributesException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidLookupAttributesException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidMaxResultsExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidMaxResultsException(body, context);
-    const contents = {
-        name: "InvalidMaxResultsException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidMaxResultsException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidNextTokenExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidNextTokenException(body, context);
-    const contents = {
-        name: "InvalidNextTokenException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidNextTokenException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidParameterCombinationExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidParameterCombinationException(body, context);
-    const contents = {
-        name: "InvalidParameterCombinationException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidParameterCombinationException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidParameterExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidParameterException(body, context);
-    const contents = {
-        name: "InvalidParameterException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidParameterException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidQueryStatementExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidQueryStatementException(body, context);
-    const contents = {
-        name: "InvalidQueryStatementException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidQueryStatementException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidQueryStatusExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidQueryStatusException(body, context);
-    const contents = {
-        name: "InvalidQueryStatusException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidQueryStatusException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidS3BucketNameExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidS3BucketNameException(body, context);
-    const contents = {
-        name: "InvalidS3BucketNameException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidS3BucketNameException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidS3PrefixExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidS3PrefixException(body, context);
-    const contents = {
-        name: "InvalidS3PrefixException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidS3PrefixException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidSnsTopicNameExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidSnsTopicNameException(body, context);
-    const contents = {
-        name: "InvalidSnsTopicNameException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidSnsTopicNameException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidTagParameterExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidTagParameterException(body, context);
-    const contents = {
-        name: "InvalidTagParameterException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidTagParameterException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidTimeRangeExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidTimeRangeException(body, context);
-    const contents = {
-        name: "InvalidTimeRangeException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidTimeRangeException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidTokenExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidTokenException(body, context);
-    const contents = {
-        name: "InvalidTokenException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidTokenException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidTrailNameExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidTrailNameException(body, context);
-    const contents = {
-        name: "InvalidTrailNameException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidTrailNameException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1KmsExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1KmsException(body, context);
-    const contents = {
-        name: "KmsException",
-        $fault: "client",
+    const exception = new models_0_1.KmsException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1KmsKeyDisabledExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1KmsKeyDisabledException(body, context);
-    const contents = {
-        name: "KmsKeyDisabledException",
-        $fault: "client",
+    const exception = new models_0_1.KmsKeyDisabledException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1KmsKeyNotFoundExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1KmsKeyNotFoundException(body, context);
-    const contents = {
-        name: "KmsKeyNotFoundException",
-        $fault: "client",
+    const exception = new models_0_1.KmsKeyNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1MaxConcurrentQueriesExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1MaxConcurrentQueriesException(body, context);
-    const contents = {
-        name: "MaxConcurrentQueriesException",
-        $fault: "client",
+    const exception = new models_0_1.MaxConcurrentQueriesException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1MaximumNumberOfTrailsExceededExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1MaximumNumberOfTrailsExceededException(body, context);
-    const contents = {
-        name: "MaximumNumberOfTrailsExceededException",
-        $fault: "client",
+    const exception = new models_0_1.MaximumNumberOfTrailsExceededException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1NotOrganizationMasterAccountException(body, context);
-    const contents = {
-        name: "NotOrganizationMasterAccountException",
-        $fault: "client",
+    const exception = new models_0_1.NotOrganizationMasterAccountException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1OperationNotPermittedExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1OperationNotPermittedException(body, context);
-    const contents = {
-        name: "OperationNotPermittedException",
-        $fault: "client",
+    const exception = new models_0_1.OperationNotPermittedException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1OrganizationNotInAllFeaturesModeException(body, context);
-    const contents = {
-        name: "OrganizationNotInAllFeaturesModeException",
-        $fault: "client",
+    const exception = new models_0_1.OrganizationNotInAllFeaturesModeException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1OrganizationsNotInUseExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1OrganizationsNotInUseException(body, context);
-    const contents = {
-        name: "OrganizationsNotInUseException",
-        $fault: "client",
+    const exception = new models_0_1.OrganizationsNotInUseException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1QueryIdNotFoundExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1QueryIdNotFoundException(body, context);
-    const contents = {
-        name: "QueryIdNotFoundException",
-        $fault: "client",
+    const exception = new models_0_1.QueryIdNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1ResourceNotFoundExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1ResourceNotFoundException(body, context);
-    const contents = {
-        name: "ResourceNotFoundException",
-        $fault: "client",
+    const exception = new models_0_1.ResourceNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1ResourceTypeNotSupportedExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1ResourceTypeNotSupportedException(body, context);
-    const contents = {
-        name: "ResourceTypeNotSupportedException",
-        $fault: "client",
+    const exception = new models_0_1.ResourceTypeNotSupportedException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1S3BucketDoesNotExistException(body, context);
-    const contents = {
-        name: "S3BucketDoesNotExistException",
-        $fault: "client",
+    const exception = new models_0_1.S3BucketDoesNotExistException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1TagsLimitExceededExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1TagsLimitExceededException(body, context);
-    const contents = {
-        name: "TagsLimitExceededException",
-        $fault: "client",
+    const exception = new models_0_1.TagsLimitExceededException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1TrailAlreadyExistsExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1TrailAlreadyExistsException(body, context);
-    const contents = {
-        name: "TrailAlreadyExistsException",
-        $fault: "client",
+    const exception = new models_0_1.TrailAlreadyExistsException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1TrailNotFoundExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1TrailNotFoundException(body, context);
-    const contents = {
-        name: "TrailNotFoundException",
-        $fault: "client",
+    const exception = new models_0_1.TrailNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1TrailNotProvidedExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1TrailNotProvidedException(body, context);
-    const contents = {
-        name: "TrailNotProvidedException",
-        $fault: "client",
+    const exception = new models_0_1.TrailNotProvidedException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1UnsupportedOperationExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1UnsupportedOperationException(body, context);
-    const contents = {
-        name: "UnsupportedOperationException",
-        $fault: "client",
+    const exception = new models_0_1.UnsupportedOperationException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const serializeAws_json1_1AddTagsRequest = (input, context) => {
     return {
@@ -4589,7 +3016,7 @@ const deserializeAws_json1_1AdvancedEventSelector = (output, context) => {
     };
 };
 const deserializeAws_json1_1AdvancedEventSelectors = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4597,6 +3024,7 @@ const deserializeAws_json1_1AdvancedEventSelectors = (output, context) => {
         }
         return deserializeAws_json1_1AdvancedEventSelector(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AdvancedFieldSelector = (output, context) => {
     return {
@@ -4622,7 +3050,7 @@ const deserializeAws_json1_1AdvancedFieldSelector = (output, context) => {
     };
 };
 const deserializeAws_json1_1AdvancedFieldSelectors = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4630,6 +3058,7 @@ const deserializeAws_json1_1AdvancedFieldSelectors = (output, context) => {
         }
         return deserializeAws_json1_1AdvancedFieldSelector(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1CancelQueryResponse = (output, context) => {
     return {
@@ -4711,7 +3140,7 @@ const deserializeAws_json1_1DataResource = (output, context) => {
     };
 };
 const deserializeAws_json1_1DataResources = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4719,9 +3148,10 @@ const deserializeAws_json1_1DataResources = (output, context) => {
         }
         return deserializeAws_json1_1DataResource(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1DataResourceValues = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4729,6 +3159,7 @@ const deserializeAws_json1_1DataResourceValues = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1DeleteEventDataStoreResponse = (output, context) => {
     return {};
@@ -4812,7 +3243,7 @@ const deserializeAws_json1_1EventDataStoreNotFoundException = (output, context)
     };
 };
 const deserializeAws_json1_1EventDataStores = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4820,6 +3251,7 @@ const deserializeAws_json1_1EventDataStores = (output, context) => {
         }
         return deserializeAws_json1_1EventDataStore(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1EventDataStoreTerminationProtectedException = (output, context) => {
     return {
@@ -4839,7 +3271,7 @@ const deserializeAws_json1_1EventSelector = (output, context) => {
     };
 };
 const deserializeAws_json1_1EventSelectors = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4847,9 +3279,10 @@ const deserializeAws_json1_1EventSelectors = (output, context) => {
         }
         return deserializeAws_json1_1EventSelector(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1EventsList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4857,9 +3290,10 @@ const deserializeAws_json1_1EventsList = (output, context) => {
         }
         return deserializeAws_json1_1Event(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1ExcludeManagementEventSources = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4867,6 +3301,7 @@ const deserializeAws_json1_1ExcludeManagementEventSources = (output, context) =>
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1GetEventDataStoreResponse = (output, context) => {
     return {
@@ -4981,7 +3416,7 @@ const deserializeAws_json1_1InsightSelector = (output, context) => {
     };
 };
 const deserializeAws_json1_1InsightSelectors = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4989,6 +3424,7 @@ const deserializeAws_json1_1InsightSelectors = (output, context) => {
         }
         return deserializeAws_json1_1InsightSelector(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionException = (output, context) => {
     return {
@@ -5209,7 +3645,7 @@ const deserializeAws_json1_1OperationNotPermittedException = (output, context) =
     };
 };
 const deserializeAws_json1_1Operator = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5217,6 +3653,7 @@ const deserializeAws_json1_1Operator = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1OrganizationNotInAllFeaturesModeException = (output, context) => {
     return {
@@ -5241,7 +3678,7 @@ const deserializeAws_json1_1PublicKey = (output, context) => {
     };
 };
 const deserializeAws_json1_1PublicKeyList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5249,6 +3686,7 @@ const deserializeAws_json1_1PublicKeyList = (output, context) => {
         }
         return deserializeAws_json1_1PublicKey(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1PutEventSelectorsResponse = (output, context) => {
     return {
@@ -5270,7 +3708,7 @@ const deserializeAws_json1_1PutInsightSelectorsResponse = (output, context) => {
     };
 };
 const deserializeAws_json1_1Queries = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5278,6 +3716,7 @@ const deserializeAws_json1_1Queries = (output, context) => {
         }
         return deserializeAws_json1_1Query(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1Query = (output, context) => {
     return {
@@ -5305,7 +3744,7 @@ const deserializeAws_json1_1QueryResultColumn = (output, context) => {
     }, {});
 };
 const deserializeAws_json1_1QueryResultRow = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5313,9 +3752,10 @@ const deserializeAws_json1_1QueryResultRow = (output, context) => {
         }
         return deserializeAws_json1_1QueryResultColumn(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1QueryResultRows = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5323,6 +3763,7 @@ const deserializeAws_json1_1QueryResultRows = (output, context) => {
         }
         return deserializeAws_json1_1QueryResultRow(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1QueryStatistics = (output, context) => {
     return {
@@ -5350,7 +3791,7 @@ const deserializeAws_json1_1Resource = (output, context) => {
     };
 };
 const deserializeAws_json1_1ResourceList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5358,6 +3799,7 @@ const deserializeAws_json1_1ResourceList = (output, context) => {
         }
         return deserializeAws_json1_1Resource(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1ResourceNotFoundException = (output, context) => {
     return {
@@ -5373,7 +3815,7 @@ const deserializeAws_json1_1ResourceTag = (output, context) => {
     };
 };
 const deserializeAws_json1_1ResourceTagList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5381,6 +3823,7 @@ const deserializeAws_json1_1ResourceTagList = (output, context) => {
         }
         return deserializeAws_json1_1ResourceTag(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1ResourceTypeNotSupportedException = (output, context) => {
     return {
@@ -5435,7 +3878,7 @@ const deserializeAws_json1_1TagsLimitExceededException = (output, context) => {
     };
 };
 const deserializeAws_json1_1TagsList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5443,6 +3886,7 @@ const deserializeAws_json1_1TagsList = (output, context) => {
         }
         return deserializeAws_json1_1Tag(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1Trail = (output, context) => {
     return {
@@ -5477,7 +3921,7 @@ const deserializeAws_json1_1TrailInfo = (output, context) => {
     };
 };
 const deserializeAws_json1_1TrailList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5485,6 +3929,7 @@ const deserializeAws_json1_1TrailList = (output, context) => {
         }
         return deserializeAws_json1_1Trail(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1TrailNotFoundException = (output, context) => {
     return {
@@ -5497,7 +3942,7 @@ const deserializeAws_json1_1TrailNotProvidedException = (output, context) => {
     };
 };
 const deserializeAws_json1_1Trails = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5505,6 +3950,7 @@ const deserializeAws_json1_1Trails = (output, context) => {
         }
         return deserializeAws_json1_1TrailInfo(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1UnsupportedOperationException = (output, context) => {
     return {