@aws-sdk/client-s3-control 3.52.0 → 3.53.0

package/dist-es/protocols/Aws_restXml.js

@@ -1,11 +1,12 @@
 import { __assign, __awaiter, __generator } from "tslib";
 import { HttpRequest as __HttpRequest, isValidHostname as __isValidHostname, } from "@aws-sdk/protocol-http";
-import { expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, expectUnion as __expectUnion, extendedEncodeURIComponent as __extendedEncodeURIComponent, getArrayIfSingleItem as __getArrayIfSingleItem, getValueFromTextNode as __getValueFromTextNode, parseBoolean as __parseBoolean, parseRfc3339DateTime as __parseRfc3339DateTime, strictParseFloat as __strictParseFloat, strictParseInt32 as __strictParseInt32, strictParseLong as __strictParseLong, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, expectUnion as __expectUnion, extendedEncodeURIComponent as __extendedEncodeURIComponent, getArrayIfSingleItem as __getArrayIfSingleItem, getValueFromTextNode as __getValueFromTextNode, parseBoolean as __parseBoolean, parseRfc3339DateTime as __parseRfc3339DateTime, strictParseFloat as __strictParseFloat, strictParseInt32 as __strictParseInt32, strictParseLong as __strictParseLong, } from "@aws-sdk/smithy-client";
 import { XmlNode as __XmlNode, XmlText as __XmlText } from "@aws-sdk/xml-builder";
 import { decodeHTML } from "entities";
 import { parse as xmlParse } from "fast-xml-parser";
 import { v4 as generateIdempotencyToken } from "uuid";
-import { JobManifestGenerator, ObjectLambdaContentTransformation, } from "../models/models_0";
+import { BadRequestException, BucketAlreadyExists, BucketAlreadyOwnedByYou, IdempotencyException, InternalServiceException, InvalidNextTokenException, InvalidRequestException, JobManifestGenerator, JobStatusException, NoSuchPublicAccessBlockConfiguration, NotFoundException, ObjectLambdaContentTransformation, TooManyRequestsException, TooManyTagsException, } from "../models/models_0";
+import { S3ControlServiceException as __BaseException } from "../models/S3ControlServiceException";
 export var serializeAws_restXmlCreateAccessPointCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body, bodyNode, node, node, node, resolvedHostname;
     return __generator(this, function (_c) {
@@ -2681,7 +2682,7 @@ export var deserializeAws_restXmlCreateAccessPointCommand = function (output, co
     });
 }); };
 var deserializeAws_restXmlCreateAccessPointCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -2696,13 +2697,14 @@ var deserializeAws_restXmlCreateAccessPointCommandError = function (output, cont
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2731,7 +2733,7 @@ export var deserializeAws_restXmlCreateAccessPointForObjectLambdaCommand = funct
     });
 }); };
 var deserializeAws_restXmlCreateAccessPointForObjectLambdaCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -2746,13 +2748,14 @@ var deserializeAws_restXmlCreateAccessPointForObjectLambdaCommandError = functio
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2785,16 +2788,16 @@ export var deserializeAws_restXmlCreateBucketCommand = function (output, context
     });
 }); };
 var deserializeAws_restXmlCreateBucketCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, parsedBody, message;
-    var _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _e = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_e.body = _f.sent(), _e)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestXmlErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2805,28 +2808,18 @@ var deserializeAws_restXmlCreateBucketCommandError = function (output, context)
                     case "com.amazonaws.s3control#BucketAlreadyOwnedByYou": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restXmlBucketAlreadyExistsResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_f.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 7];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restXmlBucketAlreadyOwnedByYouResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_f.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 7];
+            case 2: return [4, deserializeAws_restXmlBucketAlreadyExistsResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restXmlBucketAlreadyOwnedByYouResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -2855,16 +2848,16 @@ export var deserializeAws_restXmlCreateJobCommand = function (output, context) {
     });
 }); };
 var deserializeAws_restXmlCreateJobCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestXmlErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2879,40 +2872,22 @@ var deserializeAws_restXmlCreateJobCommandError = function (output, context) { r
                     case "com.amazonaws.s3control#TooManyRequestsException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restXmlBadRequestExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restXmlIdempotencyExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_restXmlBadRequestExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restXmlIdempotencyExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -2941,7 +2916,7 @@ export var deserializeAws_restXmlCreateMultiRegionAccessPointCommand = function
     });
 }); };
 var deserializeAws_restXmlCreateMultiRegionAccessPointCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -2956,13 +2931,14 @@ var deserializeAws_restXmlCreateMultiRegionAccessPointCommandError = function (o
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2985,7 +2961,7 @@ export var deserializeAws_restXmlDeleteAccessPointCommand = function (output, co
     });
 }); };
 var deserializeAws_restXmlDeleteAccessPointCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3000,13 +2976,14 @@ var deserializeAws_restXmlDeleteAccessPointCommandError = function (output, cont
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3029,7 +3006,7 @@ export var deserializeAws_restXmlDeleteAccessPointForObjectLambdaCommand = funct
     });
 }); };
 var deserializeAws_restXmlDeleteAccessPointForObjectLambdaCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3044,13 +3021,14 @@ var deserializeAws_restXmlDeleteAccessPointForObjectLambdaCommandError = functio
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3073,7 +3051,7 @@ export var deserializeAws_restXmlDeleteAccessPointPolicyCommand = function (outp
     });
 }); };
 var deserializeAws_restXmlDeleteAccessPointPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3088,13 +3066,14 @@ var deserializeAws_restXmlDeleteAccessPointPolicyCommandError = function (output
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3117,7 +3096,7 @@ export var deserializeAws_restXmlDeleteAccessPointPolicyForObjectLambdaCommand =
     });
 }); };
 var deserializeAws_restXmlDeleteAccessPointPolicyForObjectLambdaCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3132,13 +3111,14 @@ var deserializeAws_restXmlDeleteAccessPointPolicyForObjectLambdaCommandError = f
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3161,7 +3141,7 @@ export var deserializeAws_restXmlDeleteBucketCommand = function (output, context
     });
 }); };
 var deserializeAws_restXmlDeleteBucketCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3176,13 +3156,14 @@ var deserializeAws_restXmlDeleteBucketCommandError = function (output, context)
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3205,7 +3186,7 @@ export var deserializeAws_restXmlDeleteBucketLifecycleConfigurationCommand = fun
     });
 }); };
 var deserializeAws_restXmlDeleteBucketLifecycleConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3220,13 +3201,14 @@ var deserializeAws_restXmlDeleteBucketLifecycleConfigurationCommandError = funct
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3249,7 +3231,7 @@ export var deserializeAws_restXmlDeleteBucketPolicyCommand = function (output, c
     });
 }); };
 var deserializeAws_restXmlDeleteBucketPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3264,13 +3246,14 @@ var deserializeAws_restXmlDeleteBucketPolicyCommandError = function (output, con
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3293,7 +3276,7 @@ export var deserializeAws_restXmlDeleteBucketTaggingCommand = function (output,
     });
 }); };
 var deserializeAws_restXmlDeleteBucketTaggingCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3308,13 +3291,14 @@ var deserializeAws_restXmlDeleteBucketTaggingCommandError = function (output, co
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3337,16 +3321,16 @@ export var deserializeAws_restXmlDeleteJobTaggingCommand = function (output, con
     });
 }); };
 var deserializeAws_restXmlDeleteJobTaggingCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestXmlErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3359,34 +3343,20 @@ var deserializeAws_restXmlDeleteJobTaggingCommandError = function (output, conte
                     case "com.amazonaws.s3control#TooManyRequestsException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restXmlNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restXmlNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -3415,7 +3385,7 @@ export var deserializeAws_restXmlDeleteMultiRegionAccessPointCommand = function
     });
 }); };
 var deserializeAws_restXmlDeleteMultiRegionAccessPointCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3430,13 +3400,14 @@ var deserializeAws_restXmlDeleteMultiRegionAccessPointCommandError = function (o
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3459,7 +3430,7 @@ export var deserializeAws_restXmlDeletePublicAccessBlockCommand = function (outp
     });
 }); };
 var deserializeAws_restXmlDeletePublicAccessBlockCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3474,13 +3445,14 @@ var deserializeAws_restXmlDeletePublicAccessBlockCommandError = function (output
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3503,7 +3475,7 @@ export var deserializeAws_restXmlDeleteStorageLensConfigurationCommand = functio
     });
 }); };
 var deserializeAws_restXmlDeleteStorageLensConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3518,13 +3490,14 @@ var deserializeAws_restXmlDeleteStorageLensConfigurationCommandError = function
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3547,7 +3520,7 @@ export var deserializeAws_restXmlDeleteStorageLensConfigurationTaggingCommand =
     });
 }); };
 var deserializeAws_restXmlDeleteStorageLensConfigurationTaggingCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3562,13 +3535,14 @@ var deserializeAws_restXmlDeleteStorageLensConfigurationTaggingCommandError = fu
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3597,16 +3571,16 @@ export var deserializeAws_restXmlDescribeJobCommand = function (output, context)
     });
 }); };
 var deserializeAws_restXmlDescribeJobCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestXmlErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3621,40 +3595,22 @@ var deserializeAws_restXmlDescribeJobCommandError = function (output, context) {
                     case "com.amazonaws.s3control#TooManyRequestsException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restXmlBadRequestExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restXmlNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_restXmlBadRequestExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restXmlNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -3683,7 +3639,7 @@ export var deserializeAws_restXmlDescribeMultiRegionAccessPointOperationCommand
     });
 }); };
 var deserializeAws_restXmlDescribeMultiRegionAccessPointOperationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3698,13 +3654,14 @@ var deserializeAws_restXmlDescribeMultiRegionAccessPointOperationCommandError =
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3768,7 +3725,7 @@ export var deserializeAws_restXmlGetAccessPointCommand = function (output, conte
     });
 }); };
 var deserializeAws_restXmlGetAccessPointCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3783,13 +3740,14 @@ var deserializeAws_restXmlGetAccessPointCommandError = function (output, context
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3818,7 +3776,7 @@ export var deserializeAws_restXmlGetAccessPointConfigurationForObjectLambdaComma
     });
 }); };
 var deserializeAws_restXmlGetAccessPointConfigurationForObjectLambdaCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3833,13 +3791,14 @@ var deserializeAws_restXmlGetAccessPointConfigurationForObjectLambdaCommandError
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3876,7 +3835,7 @@ export var deserializeAws_restXmlGetAccessPointForObjectLambdaCommand = function
     });
 }); };
 var deserializeAws_restXmlGetAccessPointForObjectLambdaCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3891,13 +3850,14 @@ var deserializeAws_restXmlGetAccessPointForObjectLambdaCommandError = function (
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3926,7 +3886,7 @@ export var deserializeAws_restXmlGetAccessPointPolicyCommand = function (output,
     });
 }); };
 var deserializeAws_restXmlGetAccessPointPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3941,13 +3901,14 @@ var deserializeAws_restXmlGetAccessPointPolicyCommandError = function (output, c
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -3976,7 +3937,7 @@ export var deserializeAws_restXmlGetAccessPointPolicyForObjectLambdaCommand = fu
     });
 }); };
 var deserializeAws_restXmlGetAccessPointPolicyForObjectLambdaCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3991,13 +3952,14 @@ var deserializeAws_restXmlGetAccessPointPolicyForObjectLambdaCommandError = func
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4026,7 +3988,7 @@ export var deserializeAws_restXmlGetAccessPointPolicyStatusCommand = function (o
     });
 }); };
 var deserializeAws_restXmlGetAccessPointPolicyStatusCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4041,13 +4003,14 @@ var deserializeAws_restXmlGetAccessPointPolicyStatusCommandError = function (out
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4076,7 +4039,7 @@ export var deserializeAws_restXmlGetAccessPointPolicyStatusForObjectLambdaComman
     });
 }); };
 var deserializeAws_restXmlGetAccessPointPolicyStatusForObjectLambdaCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4091,13 +4054,14 @@ var deserializeAws_restXmlGetAccessPointPolicyStatusForObjectLambdaCommandError
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4134,7 +4098,7 @@ export var deserializeAws_restXmlGetBucketCommand = function (output, context) {
     });
 }); };
 var deserializeAws_restXmlGetBucketCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4149,13 +4113,14 @@ var deserializeAws_restXmlGetBucketCommandError = function (output, context) { r
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4187,7 +4152,7 @@ export var deserializeAws_restXmlGetBucketLifecycleConfigurationCommand = functi
     });
 }); };
 var deserializeAws_restXmlGetBucketLifecycleConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4202,13 +4167,14 @@ var deserializeAws_restXmlGetBucketLifecycleConfigurationCommandError = function
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4237,7 +4203,7 @@ export var deserializeAws_restXmlGetBucketPolicyCommand = function (output, cont
     });
 }); };
 var deserializeAws_restXmlGetBucketPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4252,13 +4218,14 @@ var deserializeAws_restXmlGetBucketPolicyCommandError = function (output, contex
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4290,7 +4257,7 @@ export var deserializeAws_restXmlGetBucketTaggingCommand = function (output, con
     });
 }); };
 var deserializeAws_restXmlGetBucketTaggingCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4305,13 +4272,14 @@ var deserializeAws_restXmlGetBucketTaggingCommandError = function (output, conte
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4343,16 +4311,16 @@ export var deserializeAws_restXmlGetJobTaggingCommand = function (output, contex
     });
 }); };
 var deserializeAws_restXmlGetJobTaggingCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestXmlErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4365,34 +4333,20 @@ var deserializeAws_restXmlGetJobTaggingCommandError = function (output, context)
                     case "com.amazonaws.s3control#TooManyRequestsException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restXmlNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restXmlNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -4421,7 +4375,7 @@ export var deserializeAws_restXmlGetMultiRegionAccessPointCommand = function (ou
     });
 }); };
 var deserializeAws_restXmlGetMultiRegionAccessPointCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4436,13 +4390,14 @@ var deserializeAws_restXmlGetMultiRegionAccessPointCommandError = function (outp
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4471,7 +4426,7 @@ export var deserializeAws_restXmlGetMultiRegionAccessPointPolicyCommand = functi
     });
 }); };
 var deserializeAws_restXmlGetMultiRegionAccessPointPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4486,13 +4441,14 @@ var deserializeAws_restXmlGetMultiRegionAccessPointPolicyCommandError = function
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4521,7 +4477,7 @@ export var deserializeAws_restXmlGetMultiRegionAccessPointPolicyStatusCommand =
     });
 }); };
 var deserializeAws_restXmlGetMultiRegionAccessPointPolicyStatusCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4536,13 +4492,14 @@ var deserializeAws_restXmlGetMultiRegionAccessPointPolicyStatusCommandError = fu
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4568,16 +4525,16 @@ export var deserializeAws_restXmlGetPublicAccessBlockCommand = function (output,
     });
 }); };
 var deserializeAws_restXmlGetPublicAccessBlockCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestXmlErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4586,22 +4543,16 @@ var deserializeAws_restXmlGetPublicAccessBlockCommandError = function (output, c
                     case "com.amazonaws.s3control#NoSuchPublicAccessBlockConfiguration": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restXmlNoSuchPublicAccessBlockConfigurationResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_restXmlNoSuchPublicAccessBlockConfigurationResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -4627,7 +4578,7 @@ export var deserializeAws_restXmlGetStorageLensConfigurationCommand = function (
     });
 }); };
 var deserializeAws_restXmlGetStorageLensConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4642,13 +4593,14 @@ var deserializeAws_restXmlGetStorageLensConfigurationCommandError = function (ou
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4680,7 +4632,7 @@ export var deserializeAws_restXmlGetStorageLensConfigurationTaggingCommand = fun
     });
 }); };
 var deserializeAws_restXmlGetStorageLensConfigurationTaggingCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4695,13 +4647,14 @@ var deserializeAws_restXmlGetStorageLensConfigurationTaggingCommandError = funct
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4737,7 +4690,7 @@ export var deserializeAws_restXmlListAccessPointsCommand = function (output, con
     });
 }); };
 var deserializeAws_restXmlListAccessPointsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4752,13 +4705,14 @@ var deserializeAws_restXmlListAccessPointsCommandError = function (output, conte
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4795,7 +4749,7 @@ export var deserializeAws_restXmlListAccessPointsForObjectLambdaCommand = functi
     });
 }); };
 var deserializeAws_restXmlListAccessPointsForObjectLambdaCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4810,13 +4764,14 @@ var deserializeAws_restXmlListAccessPointsForObjectLambdaCommandError = function
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4852,16 +4807,16 @@ export var deserializeAws_restXmlListJobsCommand = function (output, context) {
     });
 }); };
 var deserializeAws_restXmlListJobsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestXmlErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4874,34 +4829,20 @@ var deserializeAws_restXmlListJobsCommandError = function (output, context) { re
                     case "com.amazonaws.s3control#InvalidRequestException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restXmlInvalidNextTokenExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restXmlInvalidRequestExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restXmlInvalidNextTokenExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restXmlInvalidRequestExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -4937,7 +4878,7 @@ export var deserializeAws_restXmlListMultiRegionAccessPointsCommand = function (
     });
 }); };
 var deserializeAws_restXmlListMultiRegionAccessPointsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -4952,13 +4893,14 @@ var deserializeAws_restXmlListMultiRegionAccessPointsCommandError = function (ou
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -4994,7 +4936,7 @@ export var deserializeAws_restXmlListRegionalBucketsCommand = function (output,
     });
 }); };
 var deserializeAws_restXmlListRegionalBucketsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5009,13 +4951,14 @@ var deserializeAws_restXmlListRegionalBucketsCommandError = function (output, co
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -5051,7 +4994,7 @@ export var deserializeAws_restXmlListStorageLensConfigurationsCommand = function
     });
 }); };
 var deserializeAws_restXmlListStorageLensConfigurationsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5066,13 +5009,14 @@ var deserializeAws_restXmlListStorageLensConfigurationsCommandError = function (
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -5095,7 +5039,7 @@ export var deserializeAws_restXmlPutAccessPointConfigurationForObjectLambdaComma
     });
 }); };
 var deserializeAws_restXmlPutAccessPointConfigurationForObjectLambdaCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5110,13 +5054,14 @@ var deserializeAws_restXmlPutAccessPointConfigurationForObjectLambdaCommandError
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -5139,7 +5084,7 @@ export var deserializeAws_restXmlPutAccessPointPolicyCommand = function (output,
     });
 }); };
 var deserializeAws_restXmlPutAccessPointPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5154,13 +5099,14 @@ var deserializeAws_restXmlPutAccessPointPolicyCommandError = function (output, c
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -5183,7 +5129,7 @@ export var deserializeAws_restXmlPutAccessPointPolicyForObjectLambdaCommand = fu
     });
 }); };
 var deserializeAws_restXmlPutAccessPointPolicyForObjectLambdaCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5198,13 +5144,14 @@ var deserializeAws_restXmlPutAccessPointPolicyForObjectLambdaCommandError = func
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -5227,7 +5174,7 @@ export var deserializeAws_restXmlPutBucketLifecycleConfigurationCommand = functi
     });
 }); };
 var deserializeAws_restXmlPutBucketLifecycleConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5242,13 +5189,14 @@ var deserializeAws_restXmlPutBucketLifecycleConfigurationCommandError = function
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -5271,7 +5219,7 @@ export var deserializeAws_restXmlPutBucketPolicyCommand = function (output, cont
     });
 }); };
 var deserializeAws_restXmlPutBucketPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5286,13 +5234,14 @@ var deserializeAws_restXmlPutBucketPolicyCommandError = function (output, contex
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -5315,7 +5264,7 @@ export var deserializeAws_restXmlPutBucketTaggingCommand = function (output, con
     });
 }); };
 var deserializeAws_restXmlPutBucketTaggingCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5330,13 +5279,14 @@ var deserializeAws_restXmlPutBucketTaggingCommandError = function (output, conte
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -5359,16 +5309,16 @@ export var deserializeAws_restXmlPutJobTaggingCommand = function (output, contex
     });
 }); };
 var deserializeAws_restXmlPutJobTaggingCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestXmlErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -5383,40 +5333,22 @@ var deserializeAws_restXmlPutJobTaggingCommandError = function (output, context)
                     case "com.amazonaws.s3control#TooManyTagsException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restXmlNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restXmlTooManyTagsExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restXmlNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restXmlTooManyTagsExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -5445,7 +5377,7 @@ export var deserializeAws_restXmlPutMultiRegionAccessPointPolicyCommand = functi
     });
 }); };
 var deserializeAws_restXmlPutMultiRegionAccessPointPolicyCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5460,13 +5392,14 @@ var deserializeAws_restXmlPutMultiRegionAccessPointPolicyCommandError = function
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -5489,7 +5422,7 @@ export var deserializeAws_restXmlPutPublicAccessBlockCommand = function (output,
     });
 }); };
 var deserializeAws_restXmlPutPublicAccessBlockCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5504,13 +5437,14 @@ var deserializeAws_restXmlPutPublicAccessBlockCommandError = function (output, c
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -5533,7 +5467,7 @@ export var deserializeAws_restXmlPutStorageLensConfigurationCommand = function (
     });
 }); };
 var deserializeAws_restXmlPutStorageLensConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5548,13 +5482,14 @@ var deserializeAws_restXmlPutStorageLensConfigurationCommandError = function (ou
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -5577,7 +5512,7 @@ export var deserializeAws_restXmlPutStorageLensConfigurationTaggingCommand = fun
     });
 }); };
 var deserializeAws_restXmlPutStorageLensConfigurationTaggingCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5592,13 +5527,14 @@ var deserializeAws_restXmlPutStorageLensConfigurationTaggingCommandError = funct
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -5631,16 +5567,16 @@ export var deserializeAws_restXmlUpdateJobPriorityCommand = function (output, co
     });
 }); };
 var deserializeAws_restXmlUpdateJobPriorityCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestXmlErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -5655,40 +5591,22 @@ var deserializeAws_restXmlUpdateJobPriorityCommandError = function (output, cont
                     case "com.amazonaws.s3control#TooManyRequestsException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restXmlBadRequestExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restXmlNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 11];
+            case 2: return [4, deserializeAws_restXmlBadRequestExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restXmlNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -5725,16 +5643,16 @@ export var deserializeAws_restXmlUpdateJobStatusCommand = function (output, cont
     });
 }); };
 var deserializeAws_restXmlUpdateJobStatusCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestXmlErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -5751,231 +5669,163 @@ var deserializeAws_restXmlUpdateJobStatusCommandError = function (output, contex
                     case "com.amazonaws.s3control#TooManyRequestsException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restXmlBadRequestExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restXmlJobStatusExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restXmlNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_j.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 13];
+            case 2: return [4, deserializeAws_restXmlBadRequestExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restXmlInternalServiceExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restXmlJobStatusExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restXmlNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restXmlTooManyRequestsExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
 var deserializeAws_restXmlBadRequestExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "BadRequestException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body.Error;
         if (data["Message"] !== undefined) {
             contents.Message = __expectString(data["Message"]);
         }
-        return [2, contents];
+        exception = new BadRequestException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body.Error)];
     });
 }); };
 var deserializeAws_restXmlBucketAlreadyExistsResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "BucketAlreadyExists",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-        };
+        contents = {};
         data = parsedOutput.body.Error;
-        return [2, contents];
+        exception = new BucketAlreadyExists(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body.Error)];
     });
 }); };
 var deserializeAws_restXmlBucketAlreadyOwnedByYouResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "BucketAlreadyOwnedByYou",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-        };
+        contents = {};
         data = parsedOutput.body.Error;
-        return [2, contents];
+        exception = new BucketAlreadyOwnedByYou(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body.Error)];
     });
 }); };
 var deserializeAws_restXmlIdempotencyExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "IdempotencyException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body.Error;
         if (data["Message"] !== undefined) {
             contents.Message = __expectString(data["Message"]);
         }
-        return [2, contents];
+        exception = new IdempotencyException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body.Error)];
     });
 }); };
 var deserializeAws_restXmlInternalServiceExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "InternalServiceException",
-            $fault: "server",
-            $metadata: deserializeMetadata(parsedOutput),
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body.Error;
         if (data["Message"] !== undefined) {
             contents.Message = __expectString(data["Message"]);
         }
-        return [2, contents];
+        exception = new InternalServiceException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body.Error)];
     });
 }); };
 var deserializeAws_restXmlInvalidNextTokenExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "InvalidNextTokenException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body.Error;
         if (data["Message"] !== undefined) {
             contents.Message = __expectString(data["Message"]);
         }
-        return [2, contents];
+        exception = new InvalidNextTokenException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body.Error)];
     });
 }); };
 var deserializeAws_restXmlInvalidRequestExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "InvalidRequestException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body.Error;
         if (data["Message"] !== undefined) {
             contents.Message = __expectString(data["Message"]);
         }
-        return [2, contents];
+        exception = new InvalidRequestException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body.Error)];
     });
 }); };
 var deserializeAws_restXmlJobStatusExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "JobStatusException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body.Error;
         if (data["Message"] !== undefined) {
             contents.Message = __expectString(data["Message"]);
         }
-        return [2, contents];
+        exception = new JobStatusException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body.Error)];
     });
 }); };
 var deserializeAws_restXmlNoSuchPublicAccessBlockConfigurationResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "NoSuchPublicAccessBlockConfiguration",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body.Error;
         if (data["Message"] !== undefined) {
             contents.Message = __expectString(data["Message"]);
         }
-        return [2, contents];
+        exception = new NoSuchPublicAccessBlockConfiguration(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body.Error)];
     });
 }); };
 var deserializeAws_restXmlNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "NotFoundException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body.Error;
         if (data["Message"] !== undefined) {
             contents.Message = __expectString(data["Message"]);
         }
-        return [2, contents];
+        exception = new NotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body.Error)];
     });
 }); };
 var deserializeAws_restXmlTooManyRequestsExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "TooManyRequestsException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body.Error;
         if (data["Message"] !== undefined) {
             contents.Message = __expectString(data["Message"]);
         }
-        return [2, contents];
+        exception = new TooManyRequestsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body.Error)];
     });
 }); };
 var deserializeAws_restXmlTooManyTagsExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "TooManyTagsException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body.Error;
         if (data["Message"] !== undefined) {
             contents.Message = __expectString(data["Message"]);
         }
-        return [2, contents];
+        exception = new TooManyTagsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body.Error)];
     });
 }); };
 var serializeAws_restXmlAbortIncompleteMultipartUpload = function (input, context) {
@@ -6842,6 +6692,12 @@ var serializeAws_restXmlS3CopyObjectOperation = function (input, context) {
             .withName("BucketKeyEnabled");
         bodyNode.addChildNode(node);
     }
+    if (input.ChecksumAlgorithm !== undefined && input.ChecksumAlgorithm !== null) {
+        var node = new __XmlNode("S3ChecksumAlgorithm")
+            .addChildNode(new __XmlText(input.ChecksumAlgorithm))
+            .withName("ChecksumAlgorithm");
+        bodyNode.addChildNode(node);
+    }
     return bodyNode;
 };
 var serializeAws_restXmlS3DeleteObjectTaggingOperation = function (input, context) {
@@ -8592,6 +8448,7 @@ var deserializeAws_restXmlS3CopyObjectOperation = function (output, context) {
         ObjectLockMode: undefined,
         ObjectLockRetainUntilDate: undefined,
         BucketKeyEnabled: undefined,
+        ChecksumAlgorithm: undefined,
     };
     if (output["TargetResource"] !== undefined) {
         contents.TargetResource = __expectString(output["TargetResource"]);
@@ -8650,6 +8507,9 @@ var deserializeAws_restXmlS3CopyObjectOperation = function (output, context) {
     if (output["BucketKeyEnabled"] !== undefined) {
         contents.BucketKeyEnabled = __parseBoolean(output["BucketKeyEnabled"]);
     }
+    if (output["ChecksumAlgorithm"] !== undefined) {
+        contents.ChecksumAlgorithm = __expectString(output["ChecksumAlgorithm"]);
+    }
     return contents;
 };
 var deserializeAws_restXmlS3DeleteObjectTaggingOperation = function (output, context) {