@aws-sdk/client-kms 3.51.0 → 3.54.0

package/dist-cjs/protocols/Aws_json1_1.js

@@ -4,6 +4,8 @@ exports.deserializeAws_json1_1ConnectCustomKeyStoreCommand = exports.deserialize
 exports.deserializeAws_json1_1VerifyCommand = exports.deserializeAws_json1_1UpdatePrimaryRegionCommand = exports.deserializeAws_json1_1UpdateKeyDescriptionCommand = exports.deserializeAws_json1_1UpdateCustomKeyStoreCommand = exports.deserializeAws_json1_1UpdateAliasCommand = exports.deserializeAws_json1_1UntagResourceCommand = exports.deserializeAws_json1_1TagResourceCommand = exports.deserializeAws_json1_1SignCommand = exports.deserializeAws_json1_1ScheduleKeyDeletionCommand = exports.deserializeAws_json1_1RevokeGrantCommand = exports.deserializeAws_json1_1RetireGrantCommand = exports.deserializeAws_json1_1ReplicateKeyCommand = exports.deserializeAws_json1_1ReEncryptCommand = exports.deserializeAws_json1_1PutKeyPolicyCommand = exports.deserializeAws_json1_1ListRetirableGrantsCommand = exports.deserializeAws_json1_1ListResourceTagsCommand = exports.deserializeAws_json1_1ListKeysCommand = exports.deserializeAws_json1_1ListKeyPoliciesCommand = exports.deserializeAws_json1_1ListGrantsCommand = exports.deserializeAws_json1_1ListAliasesCommand = exports.deserializeAws_json1_1ImportKeyMaterialCommand = exports.deserializeAws_json1_1GetPublicKeyCommand = exports.deserializeAws_json1_1GetParametersForImportCommand = exports.deserializeAws_json1_1GetKeyRotationStatusCommand = exports.deserializeAws_json1_1GetKeyPolicyCommand = exports.deserializeAws_json1_1GenerateRandomCommand = exports.deserializeAws_json1_1GenerateDataKeyWithoutPlaintextCommand = exports.deserializeAws_json1_1GenerateDataKeyPairWithoutPlaintextCommand = exports.deserializeAws_json1_1GenerateDataKeyPairCommand = exports.deserializeAws_json1_1GenerateDataKeyCommand = exports.deserializeAws_json1_1EncryptCommand = exports.deserializeAws_json1_1EnableKeyRotationCommand = exports.deserializeAws_json1_1EnableKeyCommand = exports.deserializeAws_json1_1DisconnectCustomKeyStoreCommand = exports.deserializeAws_json1_1DisableKeyRotationCommand = exports.deserializeAws_json1_1DisableKeyCommand = exports.deserializeAws_json1_1DescribeKeyCommand = exports.deserializeAws_json1_1DescribeCustomKeyStoresCommand = exports.deserializeAws_json1_1DeleteImportedKeyMaterialCommand = exports.deserializeAws_json1_1DeleteCustomKeyStoreCommand = exports.deserializeAws_json1_1DeleteAliasCommand = exports.deserializeAws_json1_1DecryptCommand = exports.deserializeAws_json1_1CreateKeyCommand = exports.deserializeAws_json1_1CreateGrantCommand = exports.deserializeAws_json1_1CreateCustomKeyStoreCommand = exports.deserializeAws_json1_1CreateAliasCommand = void 0;
 const protocol_http_1 = require("@aws-sdk/protocol-http");
 const smithy_client_1 = require("@aws-sdk/smithy-client");
+const KMSServiceException_1 = require("../models/KMSServiceException");
+const models_0_1 = require("../models/models_0");
 const serializeAws_json1_1CancelKeyDeletionCommand = async (input, context) => {
     const headers = {
         "content-type": "application/x-amz-json-1.1",
@@ -509,59 +511,28 @@ const deserializeAws_json1_1CancelKeyDeletionCommandError = async (output, conte
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1ConnectCustomKeyStoreCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -588,59 +559,28 @@ const deserializeAws_json1_1ConnectCustomKeyStoreCommandError = async (output, c
     switch (errorCode) {
         case "CloudHsmClusterInvalidConfigurationException":
         case "com.amazonaws.kms#CloudHsmClusterInvalidConfigurationException":
-            response = {
-                ...(await deserializeAws_json1_1CloudHsmClusterInvalidConfigurationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudHsmClusterInvalidConfigurationExceptionResponse(parsedOutput, context);
         case "CloudHsmClusterNotActiveException":
         case "com.amazonaws.kms#CloudHsmClusterNotActiveException":
-            response = {
-                ...(await deserializeAws_json1_1CloudHsmClusterNotActiveExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudHsmClusterNotActiveExceptionResponse(parsedOutput, context);
         case "CustomKeyStoreInvalidStateException":
         case "com.amazonaws.kms#CustomKeyStoreInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse(parsedOutput, context);
         case "CustomKeyStoreNotFoundException":
         case "com.amazonaws.kms#CustomKeyStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1CreateAliasCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -664,75 +604,34 @@ const deserializeAws_json1_1CreateAliasCommandError = async (output, context) =>
     switch (errorCode) {
         case "AlreadyExistsException":
         case "com.amazonaws.kms#AlreadyExistsException":
-            response = {
-                ...(await deserializeAws_json1_1AlreadyExistsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AlreadyExistsExceptionResponse(parsedOutput, context);
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidAliasNameException":
         case "com.amazonaws.kms#InvalidAliasNameException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidAliasNameExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidAliasNameExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.kms#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1CreateCustomKeyStoreCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -759,75 +658,34 @@ const deserializeAws_json1_1CreateCustomKeyStoreCommandError = async (output, co
     switch (errorCode) {
         case "CloudHsmClusterInUseException":
         case "com.amazonaws.kms#CloudHsmClusterInUseException":
-            response = {
-                ...(await deserializeAws_json1_1CloudHsmClusterInUseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudHsmClusterInUseExceptionResponse(parsedOutput, context);
         case "CloudHsmClusterInvalidConfigurationException":
         case "com.amazonaws.kms#CloudHsmClusterInvalidConfigurationException":
-            response = {
-                ...(await deserializeAws_json1_1CloudHsmClusterInvalidConfigurationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudHsmClusterInvalidConfigurationExceptionResponse(parsedOutput, context);
         case "CloudHsmClusterNotActiveException":
         case "com.amazonaws.kms#CloudHsmClusterNotActiveException":
-            response = {
-                ...(await deserializeAws_json1_1CloudHsmClusterNotActiveExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudHsmClusterNotActiveExceptionResponse(parsedOutput, context);
         case "CloudHsmClusterNotFoundException":
         case "com.amazonaws.kms#CloudHsmClusterNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1CloudHsmClusterNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudHsmClusterNotFoundExceptionResponse(parsedOutput, context);
         case "CustomKeyStoreNameInUseException":
         case "com.amazonaws.kms#CustomKeyStoreNameInUseException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreNameInUseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreNameInUseExceptionResponse(parsedOutput, context);
         case "IncorrectTrustAnchorException":
         case "com.amazonaws.kms#IncorrectTrustAnchorException":
-            response = {
-                ...(await deserializeAws_json1_1IncorrectTrustAnchorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1IncorrectTrustAnchorExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1CreateGrantCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -854,83 +712,37 @@ const deserializeAws_json1_1CreateGrantCommandError = async (output, context) =>
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "InvalidGrantTokenException":
         case "com.amazonaws.kms#InvalidGrantTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.kms#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1CreateKeyCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -957,99 +769,43 @@ const deserializeAws_json1_1CreateKeyCommandError = async (output, context) => {
     switch (errorCode) {
         case "CloudHsmClusterInvalidConfigurationException":
         case "com.amazonaws.kms#CloudHsmClusterInvalidConfigurationException":
-            response = {
-                ...(await deserializeAws_json1_1CloudHsmClusterInvalidConfigurationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudHsmClusterInvalidConfigurationExceptionResponse(parsedOutput, context);
         case "CustomKeyStoreInvalidStateException":
         case "com.amazonaws.kms#CustomKeyStoreInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse(parsedOutput, context);
         case "CustomKeyStoreNotFoundException":
         case "com.amazonaws.kms#CustomKeyStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context);
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.kms#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "MalformedPolicyDocumentException":
         case "com.amazonaws.kms#MalformedPolicyDocumentException":
-            response = {
-                ...(await deserializeAws_json1_1MalformedPolicyDocumentExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1MalformedPolicyDocumentExceptionResponse(parsedOutput, context);
         case "TagException":
         case "com.amazonaws.kms#TagException":
-            response = {
-                ...(await deserializeAws_json1_1TagExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TagExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1DecryptCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1076,99 +832,43 @@ const deserializeAws_json1_1DecryptCommandError = async (output, context) => {
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "IncorrectKeyException":
         case "com.amazonaws.kms#IncorrectKeyException":
-            response = {
-                ...(await deserializeAws_json1_1IncorrectKeyExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1IncorrectKeyExceptionResponse(parsedOutput, context);
         case "InvalidCiphertextException":
         case "com.amazonaws.kms#InvalidCiphertextException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidCiphertextExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidCiphertextExceptionResponse(parsedOutput, context);
         case "InvalidGrantTokenException":
         case "com.amazonaws.kms#InvalidGrantTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context);
         case "InvalidKeyUsageException":
         case "com.amazonaws.kms#InvalidKeyUsageException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context);
         case "KeyUnavailableException":
         case "com.amazonaws.kms#KeyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1DeleteAliasCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1192,51 +892,25 @@ const deserializeAws_json1_1DeleteAliasCommandError = async (output, context) =>
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1DeleteCustomKeyStoreCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1263,51 +937,25 @@ const deserializeAws_json1_1DeleteCustomKeyStoreCommandError = async (output, co
     switch (errorCode) {
         case "CustomKeyStoreHasCMKsException":
         case "com.amazonaws.kms#CustomKeyStoreHasCMKsException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreHasCMKsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreHasCMKsExceptionResponse(parsedOutput, context);
         case "CustomKeyStoreInvalidStateException":
         case "com.amazonaws.kms#CustomKeyStoreInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse(parsedOutput, context);
         case "CustomKeyStoreNotFoundException":
         case "com.amazonaws.kms#CustomKeyStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1DeleteImportedKeyMaterialCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1331,67 +979,31 @@ const deserializeAws_json1_1DeleteImportedKeyMaterialCommandError = async (outpu
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1DescribeCustomKeyStoresCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1418,43 +1030,22 @@ const deserializeAws_json1_1DescribeCustomKeyStoresCommandError = async (output,
     switch (errorCode) {
         case "CustomKeyStoreNotFoundException":
         case "com.amazonaws.kms#CustomKeyStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context);
         case "InvalidMarkerException":
         case "com.amazonaws.kms#InvalidMarkerException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidMarkerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidMarkerExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1DescribeKeyCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1481,51 +1072,25 @@ const deserializeAws_json1_1DescribeKeyCommandError = async (output, context) =>
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1DisableKeyCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1549,59 +1114,28 @@ const deserializeAws_json1_1DisableKeyCommandError = async (output, context) =>
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1DisableKeyRotationCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1625,75 +1159,34 @@ const deserializeAws_json1_1DisableKeyRotationCommandError = async (output, cont
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1DisconnectCustomKeyStoreCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1720,43 +1213,22 @@ const deserializeAws_json1_1DisconnectCustomKeyStoreCommandError = async (output
     switch (errorCode) {
         case "CustomKeyStoreInvalidStateException":
         case "com.amazonaws.kms#CustomKeyStoreInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse(parsedOutput, context);
         case "CustomKeyStoreNotFoundException":
         case "com.amazonaws.kms#CustomKeyStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1EnableKeyCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1780,67 +1252,31 @@ const deserializeAws_json1_1EnableKeyCommandError = async (output, context) => {
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.kms#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1EnableKeyRotationCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1864,75 +1300,34 @@ const deserializeAws_json1_1EnableKeyRotationCommandError = async (output, conte
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1EncryptCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1959,83 +1354,37 @@ const deserializeAws_json1_1EncryptCommandError = async (output, context) => {
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidGrantTokenException":
         case "com.amazonaws.kms#InvalidGrantTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context);
         case "InvalidKeyUsageException":
         case "com.amazonaws.kms#InvalidKeyUsageException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context);
         case "KeyUnavailableException":
         case "com.amazonaws.kms#KeyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1GenerateDataKeyCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2062,83 +1411,37 @@ const deserializeAws_json1_1GenerateDataKeyCommandError = async (output, context
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidGrantTokenException":
         case "com.amazonaws.kms#InvalidGrantTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context);
         case "InvalidKeyUsageException":
         case "com.amazonaws.kms#InvalidKeyUsageException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context);
         case "KeyUnavailableException":
         case "com.amazonaws.kms#KeyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1GenerateDataKeyPairCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2165,91 +1468,40 @@ const deserializeAws_json1_1GenerateDataKeyPairCommandError = async (output, con
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidGrantTokenException":
         case "com.amazonaws.kms#InvalidGrantTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context);
         case "InvalidKeyUsageException":
         case "com.amazonaws.kms#InvalidKeyUsageException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context);
         case "KeyUnavailableException":
         case "com.amazonaws.kms#KeyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1GenerateDataKeyPairWithoutPlaintextCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2276,91 +1528,40 @@ const deserializeAws_json1_1GenerateDataKeyPairWithoutPlaintextCommandError = as
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidGrantTokenException":
         case "com.amazonaws.kms#InvalidGrantTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context);
         case "InvalidKeyUsageException":
         case "com.amazonaws.kms#InvalidKeyUsageException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context);
         case "KeyUnavailableException":
         case "com.amazonaws.kms#KeyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1GenerateDataKeyWithoutPlaintextCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2387,83 +1588,37 @@ const deserializeAws_json1_1GenerateDataKeyWithoutPlaintextCommandError = async
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidGrantTokenException":
         case "com.amazonaws.kms#InvalidGrantTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context);
         case "InvalidKeyUsageException":
         case "com.amazonaws.kms#InvalidKeyUsageException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context);
         case "KeyUnavailableException":
         case "com.amazonaws.kms#KeyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1GenerateRandomCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2490,51 +1645,25 @@ const deserializeAws_json1_1GenerateRandomCommandError = async (output, context)
     switch (errorCode) {
         case "CustomKeyStoreInvalidStateException":
         case "com.amazonaws.kms#CustomKeyStoreInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse(parsedOutput, context);
         case "CustomKeyStoreNotFoundException":
         case "com.amazonaws.kms#CustomKeyStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context);
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1GetKeyPolicyCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2561,59 +1690,28 @@ const deserializeAws_json1_1GetKeyPolicyCommandError = async (output, context) =
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1GetKeyRotationStatusCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2640,67 +1738,31 @@ const deserializeAws_json1_1GetKeyRotationStatusCommandError = async (output, co
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1GetParametersForImportCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2727,67 +1789,31 @@ const deserializeAws_json1_1GetParametersForImportCommandError = async (output,
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1GetPublicKeyCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2814,99 +1840,43 @@ const deserializeAws_json1_1GetPublicKeyCommandError = async (output, context) =
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "InvalidGrantTokenException":
         case "com.amazonaws.kms#InvalidGrantTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context);
         case "InvalidKeyUsageException":
         case "com.amazonaws.kms#InvalidKeyUsageException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context);
         case "KeyUnavailableException":
         case "com.amazonaws.kms#KeyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1ImportKeyMaterialCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2933,99 +1903,43 @@ const deserializeAws_json1_1ImportKeyMaterialCommandError = async (output, conte
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "ExpiredImportTokenException":
         case "com.amazonaws.kms#ExpiredImportTokenException":
-            response = {
-                ...(await deserializeAws_json1_1ExpiredImportTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ExpiredImportTokenExceptionResponse(parsedOutput, context);
         case "IncorrectKeyMaterialException":
         case "com.amazonaws.kms#IncorrectKeyMaterialException":
-            response = {
-                ...(await deserializeAws_json1_1IncorrectKeyMaterialExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1IncorrectKeyMaterialExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "InvalidCiphertextException":
         case "com.amazonaws.kms#InvalidCiphertextException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidCiphertextExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidCiphertextExceptionResponse(parsedOutput, context);
         case "InvalidImportTokenException":
         case "com.amazonaws.kms#InvalidImportTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidImportTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidImportTokenExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1ListAliasesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3052,59 +1966,28 @@ const deserializeAws_json1_1ListAliasesCommandError = async (output, context) =>
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "InvalidMarkerException":
         case "com.amazonaws.kms#InvalidMarkerException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidMarkerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidMarkerExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1ListGrantsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3131,75 +2014,34 @@ const deserializeAws_json1_1ListGrantsCommandError = async (output, context) =>
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "InvalidGrantIdException":
         case "com.amazonaws.kms#InvalidGrantIdException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantIdExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantIdExceptionResponse(parsedOutput, context);
         case "InvalidMarkerException":
         case "com.amazonaws.kms#InvalidMarkerException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidMarkerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidMarkerExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1ListKeyPoliciesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3226,59 +2068,28 @@ const deserializeAws_json1_1ListKeyPoliciesCommandError = async (output, context
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1ListKeysCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3305,43 +2116,22 @@ const deserializeAws_json1_1ListKeysCommandError = async (output, context) => {
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidMarkerException":
         case "com.amazonaws.kms#InvalidMarkerException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidMarkerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidMarkerExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1ListResourceTagsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3368,51 +2158,25 @@ const deserializeAws_json1_1ListResourceTagsCommandError = async (output, contex
     switch (errorCode) {
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "InvalidMarkerException":
         case "com.amazonaws.kms#InvalidMarkerException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidMarkerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidMarkerExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1ListRetirableGrantsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3439,59 +2203,28 @@ const deserializeAws_json1_1ListRetirableGrantsCommandError = async (output, con
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "InvalidMarkerException":
         case "com.amazonaws.kms#InvalidMarkerException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidMarkerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidMarkerExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1PutKeyPolicyCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3515,83 +2248,37 @@ const deserializeAws_json1_1PutKeyPolicyCommandError = async (output, context) =
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.kms#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "MalformedPolicyDocumentException":
         case "com.amazonaws.kms#MalformedPolicyDocumentException":
-            response = {
-                ...(await deserializeAws_json1_1MalformedPolicyDocumentExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1MalformedPolicyDocumentExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1ReEncryptCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3618,99 +2305,43 @@ const deserializeAws_json1_1ReEncryptCommandError = async (output, context) => {
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "IncorrectKeyException":
         case "com.amazonaws.kms#IncorrectKeyException":
-            response = {
-                ...(await deserializeAws_json1_1IncorrectKeyExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1IncorrectKeyExceptionResponse(parsedOutput, context);
         case "InvalidCiphertextException":
         case "com.amazonaws.kms#InvalidCiphertextException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidCiphertextExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidCiphertextExceptionResponse(parsedOutput, context);
         case "InvalidGrantTokenException":
         case "com.amazonaws.kms#InvalidGrantTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context);
         case "InvalidKeyUsageException":
         case "com.amazonaws.kms#InvalidKeyUsageException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context);
         case "KeyUnavailableException":
         case "com.amazonaws.kms#KeyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1ReplicateKeyCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3737,99 +2368,43 @@ const deserializeAws_json1_1ReplicateKeyCommandError = async (output, context) =
     switch (errorCode) {
         case "AlreadyExistsException":
         case "com.amazonaws.kms#AlreadyExistsException":
-            response = {
-                ...(await deserializeAws_json1_1AlreadyExistsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1AlreadyExistsExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.kms#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "MalformedPolicyDocumentException":
         case "com.amazonaws.kms#MalformedPolicyDocumentException":
-            response = {
-                ...(await deserializeAws_json1_1MalformedPolicyDocumentExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1MalformedPolicyDocumentExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "TagException":
         case "com.amazonaws.kms#TagException":
-            response = {
-                ...(await deserializeAws_json1_1TagExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TagExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1RetireGrantCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3853,75 +2428,34 @@ const deserializeAws_json1_1RetireGrantCommandError = async (output, context) =>
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "InvalidGrantIdException":
         case "com.amazonaws.kms#InvalidGrantIdException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantIdExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantIdExceptionResponse(parsedOutput, context);
         case "InvalidGrantTokenException":
         case "com.amazonaws.kms#InvalidGrantTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1RevokeGrantCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -3945,67 +2479,31 @@ const deserializeAws_json1_1RevokeGrantCommandError = async (output, context) =>
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "InvalidGrantIdException":
         case "com.amazonaws.kms#InvalidGrantIdException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantIdExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantIdExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1ScheduleKeyDeletionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -4032,59 +2530,28 @@ const deserializeAws_json1_1ScheduleKeyDeletionCommandError = async (output, con
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1SignCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -4111,83 +2578,37 @@ const deserializeAws_json1_1SignCommandError = async (output, context) => {
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidGrantTokenException":
         case "com.amazonaws.kms#InvalidGrantTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context);
         case "InvalidKeyUsageException":
         case "com.amazonaws.kms#InvalidKeyUsageException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context);
         case "KeyUnavailableException":
         case "com.amazonaws.kms#KeyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1TagResourceCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -4211,67 +2632,31 @@ const deserializeAws_json1_1TagResourceCommandError = async (output, context) =>
     switch (errorCode) {
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.kms#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "TagException":
         case "com.amazonaws.kms#TagException":
-            response = {
-                ...(await deserializeAws_json1_1TagExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TagExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1UntagResourceCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -4295,59 +2680,28 @@ const deserializeAws_json1_1UntagResourceCommandError = async (output, context)
     switch (errorCode) {
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "TagException":
         case "com.amazonaws.kms#TagException":
-            response = {
-                ...(await deserializeAws_json1_1TagExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TagExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1UpdateAliasCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -4371,59 +2725,28 @@ const deserializeAws_json1_1UpdateAliasCommandError = async (output, context) =>
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.kms#LimitExceededException":
-            response = {
-                ...(await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1LimitExceededExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1UpdateCustomKeyStoreCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -4450,83 +2773,37 @@ const deserializeAws_json1_1UpdateCustomKeyStoreCommandError = async (output, co
     switch (errorCode) {
         case "CloudHsmClusterInvalidConfigurationException":
         case "com.amazonaws.kms#CloudHsmClusterInvalidConfigurationException":
-            response = {
-                ...(await deserializeAws_json1_1CloudHsmClusterInvalidConfigurationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudHsmClusterInvalidConfigurationExceptionResponse(parsedOutput, context);
         case "CloudHsmClusterNotActiveException":
         case "com.amazonaws.kms#CloudHsmClusterNotActiveException":
-            response = {
-                ...(await deserializeAws_json1_1CloudHsmClusterNotActiveExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudHsmClusterNotActiveExceptionResponse(parsedOutput, context);
         case "CloudHsmClusterNotFoundException":
         case "com.amazonaws.kms#CloudHsmClusterNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1CloudHsmClusterNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudHsmClusterNotFoundExceptionResponse(parsedOutput, context);
         case "CloudHsmClusterNotRelatedException":
         case "com.amazonaws.kms#CloudHsmClusterNotRelatedException":
-            response = {
-                ...(await deserializeAws_json1_1CloudHsmClusterNotRelatedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CloudHsmClusterNotRelatedExceptionResponse(parsedOutput, context);
         case "CustomKeyStoreInvalidStateException":
         case "com.amazonaws.kms#CustomKeyStoreInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse(parsedOutput, context);
         case "CustomKeyStoreNameInUseException":
         case "com.amazonaws.kms#CustomKeyStoreNameInUseException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreNameInUseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreNameInUseExceptionResponse(parsedOutput, context);
         case "CustomKeyStoreNotFoundException":
         case "com.amazonaws.kms#CustomKeyStoreNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1UpdateKeyDescriptionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -4550,59 +2827,28 @@ const deserializeAws_json1_1UpdateKeyDescriptionCommandError = async (output, co
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1UpdatePrimaryRegionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -4626,67 +2872,31 @@ const deserializeAws_json1_1UpdatePrimaryRegionCommandError = async (output, con
     switch (errorCode) {
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidArnException":
         case "com.amazonaws.kms#InvalidArnException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidArnExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context);
         case "UnsupportedOperationException":
         case "com.amazonaws.kms#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 KMSServiceException_1.KMSServiceException({
+                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_1VerifyCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -4713,454 +2923,337 @@ const deserializeAws_json1_1VerifyCommandError = async (output, context) => {
     switch (errorCode) {
         case "DependencyTimeoutException":
         case "com.amazonaws.kms#DependencyTimeoutException":
-            response = {
-                ...(await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DependencyTimeoutExceptionResponse(parsedOutput, context);
         case "DisabledException":
         case "com.amazonaws.kms#DisabledException":
-            response = {
-                ...(await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1DisabledExceptionResponse(parsedOutput, context);
         case "InvalidGrantTokenException":
         case "com.amazonaws.kms#InvalidGrantTokenException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidGrantTokenExceptionResponse(parsedOutput, context);
         case "InvalidKeyUsageException":
         case "com.amazonaws.kms#InvalidKeyUsageException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidKeyUsageExceptionResponse(parsedOutput, context);
         case "KeyUnavailableException":
         case "com.amazonaws.kms#KeyUnavailableException":
-            response = {
-                ...(await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KeyUnavailableExceptionResponse(parsedOutput, context);
         case "KMSInternalException":
         case "com.amazonaws.kms#KMSInternalException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInternalExceptionResponse(parsedOutput, context);
         case "KMSInvalidSignatureException":
         case "com.amazonaws.kms#KMSInvalidSignatureException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidSignatureExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidSignatureExceptionResponse(parsedOutput, context);
         case "KMSInvalidStateException":
         case "com.amazonaws.kms#KMSInvalidStateException":
-            response = {
-                ...(await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1KMSInvalidStateExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kms#NotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1NotFoundExceptionResponse(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 KMSServiceException_1.KMSServiceException({
+                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_1AlreadyExistsExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1AlreadyExistsException(body, context);
-    const contents = {
-        name: "AlreadyExistsException",
-        $fault: "client",
+    const exception = new models_0_1.AlreadyExistsException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1CloudHsmClusterInUseExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CloudHsmClusterInUseException(body, context);
-    const contents = {
-        name: "CloudHsmClusterInUseException",
-        $fault: "client",
+    const exception = new models_0_1.CloudHsmClusterInUseException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1CloudHsmClusterInvalidConfigurationExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CloudHsmClusterInvalidConfigurationException(body, context);
-    const contents = {
-        name: "CloudHsmClusterInvalidConfigurationException",
-        $fault: "client",
+    const exception = new models_0_1.CloudHsmClusterInvalidConfigurationException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1CloudHsmClusterNotActiveExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CloudHsmClusterNotActiveException(body, context);
-    const contents = {
-        name: "CloudHsmClusterNotActiveException",
-        $fault: "client",
+    const exception = new models_0_1.CloudHsmClusterNotActiveException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1CloudHsmClusterNotFoundExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CloudHsmClusterNotFoundException(body, context);
-    const contents = {
-        name: "CloudHsmClusterNotFoundException",
-        $fault: "client",
+    const exception = new models_0_1.CloudHsmClusterNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1CloudHsmClusterNotRelatedExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CloudHsmClusterNotRelatedException(body, context);
-    const contents = {
-        name: "CloudHsmClusterNotRelatedException",
-        $fault: "client",
+    const exception = new models_0_1.CloudHsmClusterNotRelatedException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1CustomKeyStoreHasCMKsExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CustomKeyStoreHasCMKsException(body, context);
-    const contents = {
-        name: "CustomKeyStoreHasCMKsException",
-        $fault: "client",
+    const exception = new models_0_1.CustomKeyStoreHasCMKsException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1CustomKeyStoreInvalidStateExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CustomKeyStoreInvalidStateException(body, context);
-    const contents = {
-        name: "CustomKeyStoreInvalidStateException",
-        $fault: "client",
+    const exception = new models_0_1.CustomKeyStoreInvalidStateException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1CustomKeyStoreNameInUseExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CustomKeyStoreNameInUseException(body, context);
-    const contents = {
-        name: "CustomKeyStoreNameInUseException",
-        $fault: "client",
+    const exception = new models_0_1.CustomKeyStoreNameInUseException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1CustomKeyStoreNotFoundExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1CustomKeyStoreNotFoundException(body, context);
-    const contents = {
-        name: "CustomKeyStoreNotFoundException",
-        $fault: "client",
+    const exception = new models_0_1.CustomKeyStoreNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1DependencyTimeoutExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1DependencyTimeoutException(body, context);
-    const contents = {
-        name: "DependencyTimeoutException",
-        $fault: "server",
+    const exception = new models_0_1.DependencyTimeoutException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1DisabledExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1DisabledException(body, context);
-    const contents = {
-        name: "DisabledException",
-        $fault: "client",
+    const exception = new models_0_1.DisabledException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1ExpiredImportTokenExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1ExpiredImportTokenException(body, context);
-    const contents = {
-        name: "ExpiredImportTokenException",
-        $fault: "client",
+    const exception = new models_0_1.ExpiredImportTokenException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1IncorrectKeyExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1IncorrectKeyException(body, context);
-    const contents = {
-        name: "IncorrectKeyException",
-        $fault: "client",
+    const exception = new models_0_1.IncorrectKeyException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1IncorrectKeyMaterialExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1IncorrectKeyMaterialException(body, context);
-    const contents = {
-        name: "IncorrectKeyMaterialException",
-        $fault: "client",
+    const exception = new models_0_1.IncorrectKeyMaterialException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1IncorrectTrustAnchorExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1IncorrectTrustAnchorException(body, context);
-    const contents = {
-        name: "IncorrectTrustAnchorException",
-        $fault: "client",
+    const exception = new models_0_1.IncorrectTrustAnchorException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidAliasNameExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidAliasNameException(body, context);
-    const contents = {
-        name: "InvalidAliasNameException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidAliasNameException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidArnExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidArnException(body, context);
-    const contents = {
-        name: "InvalidArnException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidArnException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidCiphertextExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidCiphertextException(body, context);
-    const contents = {
-        name: "InvalidCiphertextException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidCiphertextException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidGrantIdExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidGrantIdException(body, context);
-    const contents = {
-        name: "InvalidGrantIdException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidGrantIdException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidGrantTokenExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidGrantTokenException(body, context);
-    const contents = {
-        name: "InvalidGrantTokenException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidGrantTokenException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidImportTokenExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidImportTokenException(body, context);
-    const contents = {
-        name: "InvalidImportTokenException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidImportTokenException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidKeyUsageExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidKeyUsageException(body, context);
-    const contents = {
-        name: "InvalidKeyUsageException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidKeyUsageException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidMarkerExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidMarkerException(body, context);
-    const contents = {
-        name: "InvalidMarkerException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidMarkerException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1KeyUnavailableExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1KeyUnavailableException(body, context);
-    const contents = {
-        name: "KeyUnavailableException",
-        $fault: "server",
+    const exception = new models_0_1.KeyUnavailableException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1KMSInternalExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1KMSInternalException(body, context);
-    const contents = {
-        name: "KMSInternalException",
-        $fault: "server",
+    const exception = new models_0_1.KMSInternalException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1KMSInvalidSignatureExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1KMSInvalidSignatureException(body, context);
-    const contents = {
-        name: "KMSInvalidSignatureException",
-        $fault: "client",
+    const exception = new models_0_1.KMSInvalidSignatureException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1KMSInvalidStateExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1KMSInvalidStateException(body, context);
-    const contents = {
-        name: "KMSInvalidStateException",
-        $fault: "client",
+    const exception = new models_0_1.KMSInvalidStateException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1LimitExceededExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1LimitExceededException(body, context);
-    const contents = {
-        name: "LimitExceededException",
-        $fault: "client",
+    const exception = new models_0_1.LimitExceededException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1MalformedPolicyDocumentExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1MalformedPolicyDocumentException(body, context);
-    const contents = {
-        name: "MalformedPolicyDocumentException",
-        $fault: "client",
+    const exception = new models_0_1.MalformedPolicyDocumentException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1NotFoundExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1NotFoundException(body, context);
-    const contents = {
-        name: "NotFoundException",
-        $fault: "client",
+    const exception = new models_0_1.NotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1TagExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1TagException(body, context);
-    const contents = {
-        name: "TagException",
-        $fault: "client",
+    const exception = new models_0_1.TagException({
         $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_1CancelKeyDeletionRequest = (input, context) => {
     return {
@@ -5665,7 +3758,7 @@ const serializeAws_json1_1VerifyRequest = (input, context) => {
     };
 };
 const deserializeAws_json1_1AliasList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5673,6 +3766,7 @@ const deserializeAws_json1_1AliasList = (output, context) => {
         }
         return deserializeAws_json1_1AliasListEntry(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1AliasListEntry = (output, context) => {
     return {
@@ -5764,7 +3858,7 @@ const deserializeAws_json1_1CustomKeyStoreNotFoundException = (output, context)
     };
 };
 const deserializeAws_json1_1CustomKeyStoresList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5772,6 +3866,7 @@ const deserializeAws_json1_1CustomKeyStoresList = (output, context) => {
         }
         return deserializeAws_json1_1CustomKeyStoresListEntry(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1CustomKeyStoresListEntry = (output, context) => {
     return {
@@ -5826,7 +3921,7 @@ const deserializeAws_json1_1DisconnectCustomKeyStoreResponse = (output, context)
     return {};
 };
 const deserializeAws_json1_1EncryptionAlgorithmSpecList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5834,6 +3929,7 @@ const deserializeAws_json1_1EncryptionAlgorithmSpecList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1EncryptionContextType = (output, context) => {
     return Object.entries(output).reduce((acc, [key, value]) => {
@@ -5953,7 +4049,7 @@ const deserializeAws_json1_1GrantConstraints = (output, context) => {
     };
 };
 const deserializeAws_json1_1GrantList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5961,6 +4057,7 @@ const deserializeAws_json1_1GrantList = (output, context) => {
         }
         return deserializeAws_json1_1GrantListEntry(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1GrantListEntry = (output, context) => {
     return {
@@ -5982,7 +4079,7 @@ const deserializeAws_json1_1GrantListEntry = (output, context) => {
     };
 };
 const deserializeAws_json1_1GrantOperationList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5990,6 +4087,7 @@ const deserializeAws_json1_1GrantOperationList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1ImportKeyMaterialResponse = (output, context) => {
     return {};
@@ -6050,7 +4148,7 @@ const deserializeAws_json1_1InvalidMarkerException = (output, context) => {
     };
 };
 const deserializeAws_json1_1KeyList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -6058,6 +4156,7 @@ const deserializeAws_json1_1KeyList = (output, context) => {
         }
         return deserializeAws_json1_1KeyListEntry(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1KeyListEntry = (output, context) => {
     return {
@@ -6196,7 +4295,7 @@ const deserializeAws_json1_1MultiRegionKey = (output, context) => {
     };
 };
 const deserializeAws_json1_1MultiRegionKeyList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -6204,6 +4303,7 @@ const deserializeAws_json1_1MultiRegionKeyList = (output, context) => {
         }
         return deserializeAws_json1_1MultiRegionKey(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1NotFoundException = (output, context) => {
     return {
@@ -6211,7 +4311,7 @@ const deserializeAws_json1_1NotFoundException = (output, context) => {
     };
 };
 const deserializeAws_json1_1PolicyNameList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -6219,6 +4319,7 @@ const deserializeAws_json1_1PolicyNameList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1ReEncryptResponse = (output, context) => {
     return {
@@ -6253,7 +4354,7 @@ const deserializeAws_json1_1ScheduleKeyDeletionResponse = (output, context) => {
     };
 };
 const deserializeAws_json1_1SigningAlgorithmSpecList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -6261,6 +4362,7 @@ const deserializeAws_json1_1SigningAlgorithmSpecList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1SignResponse = (output, context) => {
     return {
@@ -6281,7 +4383,7 @@ const deserializeAws_json1_1TagException = (output, context) => {
     };
 };
 const deserializeAws_json1_1TagList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -6289,6 +4391,7 @@ const deserializeAws_json1_1TagList = (output, context) => {
         }
         return deserializeAws_json1_1Tag(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1UnsupportedOperationException = (output, context) => {
     return {