@aws-sdk/client-sns 3.51.0 → 3.54.0

package/dist-es/protocols/Aws_query.js

@@ -1,8 +1,10 @@
 import { __assign, __awaiter, __generator, __read, __values } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { expectNonNull as __expectNonNull, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, getArrayIfSingleItem as __getArrayIfSingleItem, getValueFromTextNode as __getValueFromTextNode, parseBoolean as __parseBoolean, parseRfc3339DateTime as __parseRfc3339DateTime, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectNonNull as __expectNonNull, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, getArrayIfSingleItem as __getArrayIfSingleItem, getValueFromTextNode as __getValueFromTextNode, parseBoolean as __parseBoolean, parseRfc3339DateTime as __parseRfc3339DateTime, } from "@aws-sdk/smithy-client";
 import { decodeHTML } from "entities";
 import { parse as xmlParse } from "fast-xml-parser";
+import { AuthorizationErrorException, BatchEntryIdsNotDistinctException, BatchRequestTooLongException, ConcurrentAccessException, EmptyBatchRequestException, EndpointDisabledException, FilterPolicyLimitExceededException, InternalErrorException, InvalidBatchEntryIdException, InvalidParameterException, InvalidParameterValueException, InvalidSecurityException, KMSAccessDeniedException, KMSDisabledException, KMSInvalidStateException, KMSNotFoundException, KMSOptInRequired, KMSThrottlingException, NotFoundException, OptedOutException, PlatformApplicationDisabledException, ResourceNotFoundException, StaleTagException, SubscriptionLimitExceededException, TagLimitExceededException, TagPolicyException, ThrottledException, TooManyEntriesInBatchRequestException, TopicLimitExceededException, UserErrorException, ValidationException, VerificationException, } from "../models/models_0";
+import { SNSServiceException as __BaseException } from "../models/SNSServiceException";
 export var serializeAws_queryAddPermissionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
     var headers, body;
     return __generator(this, function (_a) {
@@ -422,16 +424,16 @@ export var deserializeAws_queryAddPermissionCommand = function (output, context)
     });
 }); };
 var deserializeAws_queryAddPermissionCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -446,40 +448,22 @@ var deserializeAws_queryAddPermissionCommandError = function (output, context) {
                     case "com.amazonaws.sns#NotFoundException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -502,16 +486,16 @@ export var deserializeAws_queryCheckIfPhoneNumberIsOptedOutCommand = function (o
     });
 }); };
 var deserializeAws_queryCheckIfPhoneNumberIsOptedOutCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -526,40 +510,22 @@ var deserializeAws_queryCheckIfPhoneNumberIsOptedOutCommandError = function (out
                     case "com.amazonaws.sns#ThrottledException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryThrottledExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryThrottledExceptionResponse(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);
         }
     });
 }); };
@@ -582,16 +548,16 @@ export var deserializeAws_queryConfirmSubscriptionCommand = function (output, co
     });
 }); };
 var deserializeAws_queryConfirmSubscriptionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -610,52 +576,26 @@ var deserializeAws_queryConfirmSubscriptionCommandError = function (output, cont
                     case "com.amazonaws.sns#SubscriptionLimitExceededException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_queryFilterPolicyLimitExceededExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_queryNotFoundExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_querySubscriptionLimitExceededExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryFilterPolicyLimitExceededExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryNotFoundExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_querySubscriptionLimitExceededExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 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) });
-                _k.label = 15;
-            case 15:
-                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);
         }
     });
 }); };
@@ -678,16 +618,16 @@ export var deserializeAws_queryCreatePlatformApplicationCommand = function (outp
     });
 }); };
 var deserializeAws_queryCreatePlatformApplicationCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -700,34 +640,20 @@ var deserializeAws_queryCreatePlatformApplicationCommandError = function (output
                     case "com.amazonaws.sns#InvalidParameterException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(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);
         }
     });
 }); };
@@ -750,16 +676,16 @@ export var deserializeAws_queryCreatePlatformEndpointCommand = function (output,
     });
 }); };
 var deserializeAws_queryCreatePlatformEndpointCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -774,40 +700,22 @@ var deserializeAws_queryCreatePlatformEndpointCommandError = function (output, c
                     case "com.amazonaws.sns#NotFoundException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -830,16 +738,16 @@ export var deserializeAws_queryCreateSMSSandboxPhoneNumberCommand = function (ou
     });
 }); };
 var deserializeAws_queryCreateSMSSandboxPhoneNumberCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -858,52 +766,26 @@ var deserializeAws_queryCreateSMSSandboxPhoneNumberCommandError = function (outp
                     case "com.amazonaws.sns#UserErrorException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_queryOptedOutExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_queryThrottledExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_queryUserErrorExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryOptedOutExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryThrottledExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_queryUserErrorExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 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) });
-                _k.label = 15;
-            case 15:
-                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);
         }
     });
 }); };
@@ -926,16 +808,16 @@ export var deserializeAws_queryCreateTopicCommand = function (output, context) {
     });
 }); };
 var deserializeAws_queryCreateTopicCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, parsedBody, message;
-    var _m;
-    return __generator(this, function (_o) {
-        switch (_o.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _m = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_m.body = _o.sent(), _m)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -960,70 +842,32 @@ var deserializeAws_queryCreateTopicCommandError = function (output, context) { r
                     case "com.amazonaws.sns#TopicLimitExceededException": return [3, 18];
                 }
                 return [3, 20];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_queryConcurrentAccessExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_queryInvalidSecurityExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_queryStaleTagExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_queryTagLimitExceededExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_queryTagPolicyExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_queryTopicLimitExceededExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_o.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 21];
+            case 2: return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryConcurrentAccessExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryInvalidSecurityExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_queryStaleTagExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_queryTagLimitExceededExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_queryTagPolicyExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_queryTopicLimitExceededExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
             case 20:
                 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) });
-                _o.label = 21;
-            case 21:
-                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);
         }
     });
 }); };
@@ -1046,16 +890,16 @@ export var deserializeAws_queryDeleteEndpointCommand = function (output, context
     });
 }); };
 var deserializeAws_queryDeleteEndpointCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1068,34 +912,20 @@ var deserializeAws_queryDeleteEndpointCommandError = function (output, context)
                     case "com.amazonaws.sns#InvalidParameterException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(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);
         }
     });
 }); };
@@ -1118,16 +948,16 @@ export var deserializeAws_queryDeletePlatformApplicationCommand = function (outp
     });
 }); };
 var deserializeAws_queryDeletePlatformApplicationCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1140,34 +970,20 @@ var deserializeAws_queryDeletePlatformApplicationCommandError = function (output
                     case "com.amazonaws.sns#InvalidParameterException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(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);
         }
     });
 }); };
@@ -1190,16 +1006,16 @@ export var deserializeAws_queryDeleteSMSSandboxPhoneNumberCommand = function (ou
     });
 }); };
 var deserializeAws_queryDeleteSMSSandboxPhoneNumberCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1218,52 +1034,26 @@ var deserializeAws_queryDeleteSMSSandboxPhoneNumberCommandError = function (outp
                     case "com.amazonaws.sns#UserErrorException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_queryThrottledExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_queryUserErrorExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryThrottledExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_queryUserErrorExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 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) });
-                _k.label = 15;
-            case 15:
-                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);
         }
     });
 }); };
@@ -1286,16 +1076,16 @@ export var deserializeAws_queryDeleteTopicCommand = function (output, context) {
     });
 }); };
 var deserializeAws_queryDeleteTopicCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, parsedBody, message;
-    var _k;
-    return __generator(this, function (_l) {
-        switch (_l.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _k = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_k.body = _l.sent(), _k)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1316,58 +1106,28 @@ var deserializeAws_queryDeleteTopicCommandError = function (output, context) { r
                     case "com.amazonaws.sns#TagPolicyException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_queryConcurrentAccessExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_queryNotFoundExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_queryStaleTagExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_queryTagPolicyExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
+            case 2: return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryConcurrentAccessExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryNotFoundExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_queryStaleTagExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_queryTagPolicyExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 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) });
-                _l.label = 17;
-            case 17:
-                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);
         }
     });
 }); };
@@ -1390,16 +1150,16 @@ export var deserializeAws_queryGetEndpointAttributesCommand = function (output,
     });
 }); };
 var deserializeAws_queryGetEndpointAttributesCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1414,40 +1174,22 @@ var deserializeAws_queryGetEndpointAttributesCommandError = function (output, co
                     case "com.amazonaws.sns#NotFoundException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -1470,16 +1212,16 @@ export var deserializeAws_queryGetPlatformApplicationAttributesCommand = functio
     });
 }); };
 var deserializeAws_queryGetPlatformApplicationAttributesCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1494,40 +1236,22 @@ var deserializeAws_queryGetPlatformApplicationAttributesCommandError = function
                     case "com.amazonaws.sns#NotFoundException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -1550,16 +1274,16 @@ export var deserializeAws_queryGetSMSAttributesCommand = function (output, conte
     });
 }); };
 var deserializeAws_queryGetSMSAttributesCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1574,40 +1298,22 @@ var deserializeAws_queryGetSMSAttributesCommandError = function (output, context
                     case "com.amazonaws.sns#ThrottledException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryThrottledExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryThrottledExceptionResponse(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);
         }
     });
 }); };
@@ -1630,16 +1336,16 @@ export var deserializeAws_queryGetSMSSandboxAccountStatusCommand = function (out
     });
 }); };
 var deserializeAws_queryGetSMSSandboxAccountStatusCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1652,34 +1358,20 @@ var deserializeAws_queryGetSMSSandboxAccountStatusCommandError = function (outpu
                     case "com.amazonaws.sns#ThrottledException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryThrottledExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryThrottledExceptionResponse(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);
         }
     });
 }); };
@@ -1702,16 +1394,16 @@ export var deserializeAws_queryGetSubscriptionAttributesCommand = function (outp
     });
 }); };
 var deserializeAws_queryGetSubscriptionAttributesCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1726,40 +1418,22 @@ var deserializeAws_queryGetSubscriptionAttributesCommandError = function (output
                     case "com.amazonaws.sns#NotFoundException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -1782,16 +1456,16 @@ export var deserializeAws_queryGetTopicAttributesCommand = function (output, con
     });
 }); };
 var deserializeAws_queryGetTopicAttributesCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1808,46 +1482,24 @@ var deserializeAws_queryGetTopicAttributesCommandError = function (output, conte
                     case "com.amazonaws.sns#NotFoundException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryInvalidSecurityExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryInvalidSecurityExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -1870,16 +1522,16 @@ export var deserializeAws_queryListEndpointsByPlatformApplicationCommand = funct
     });
 }); };
 var deserializeAws_queryListEndpointsByPlatformApplicationCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1894,40 +1546,22 @@ var deserializeAws_queryListEndpointsByPlatformApplicationCommandError = functio
                     case "com.amazonaws.sns#NotFoundException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -1950,16 +1584,16 @@ export var deserializeAws_queryListOriginationNumbersCommand = function (output,
     });
 }); };
 var deserializeAws_queryListOriginationNumbersCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1976,46 +1610,24 @@ var deserializeAws_queryListOriginationNumbersCommandError = function (output, c
                     case "com.amazonaws.sns#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryThrottledExceptionResponse(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_queryValidationExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryThrottledExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryValidationExceptionResponse(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);
         }
     });
 }); };
@@ -2038,16 +1650,16 @@ export var deserializeAws_queryListPhoneNumbersOptedOutCommand = function (outpu
     });
 }); };
 var deserializeAws_queryListPhoneNumbersOptedOutCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2062,40 +1674,22 @@ var deserializeAws_queryListPhoneNumbersOptedOutCommandError = function (output,
                     case "com.amazonaws.sns#ThrottledException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryThrottledExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryThrottledExceptionResponse(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);
         }
     });
 }); };
@@ -2118,16 +1712,16 @@ export var deserializeAws_queryListPlatformApplicationsCommand = function (outpu
     });
 }); };
 var deserializeAws_queryListPlatformApplicationsCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2140,34 +1734,20 @@ var deserializeAws_queryListPlatformApplicationsCommandError = function (output,
                     case "com.amazonaws.sns#InvalidParameterException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(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);
         }
     });
 }); };
@@ -2190,16 +1770,16 @@ export var deserializeAws_queryListSMSSandboxPhoneNumbersCommand = function (out
     });
 }); };
 var deserializeAws_queryListSMSSandboxPhoneNumbersCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2216,46 +1796,24 @@ var deserializeAws_queryListSMSSandboxPhoneNumbersCommandError = function (outpu
                     case "com.amazonaws.sns#ThrottledException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryResourceNotFoundExceptionResponse(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_queryThrottledExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryThrottledExceptionResponse(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);
         }
     });
 }); };
@@ -2278,16 +1836,16 @@ export var deserializeAws_queryListSubscriptionsCommand = function (output, cont
     });
 }); };
 var deserializeAws_queryListSubscriptionsCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2300,34 +1858,20 @@ var deserializeAws_queryListSubscriptionsCommandError = function (output, contex
                     case "com.amazonaws.sns#InvalidParameterException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(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);
         }
     });
 }); };
@@ -2350,16 +1894,16 @@ export var deserializeAws_queryListSubscriptionsByTopicCommand = function (outpu
     });
 }); };
 var deserializeAws_queryListSubscriptionsByTopicCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2374,40 +1918,22 @@ var deserializeAws_queryListSubscriptionsByTopicCommandError = function (output,
                     case "com.amazonaws.sns#NotFoundException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -2430,16 +1956,16 @@ export var deserializeAws_queryListTagsForResourceCommand = function (output, co
     });
 }); };
 var deserializeAws_queryListTagsForResourceCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2456,46 +1982,24 @@ var deserializeAws_queryListTagsForResourceCommandError = function (output, cont
                     case "com.amazonaws.sns#TagPolicyException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryConcurrentAccessExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryResourceNotFoundExceptionResponse(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_queryTagPolicyExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryConcurrentAccessExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryTagPolicyExceptionResponse(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);
         }
     });
 }); };
@@ -2518,16 +2022,16 @@ export var deserializeAws_queryListTopicsCommand = function (output, context) {
     });
 }); };
 var deserializeAws_queryListTopicsCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2540,34 +2044,20 @@ var deserializeAws_queryListTopicsCommandError = function (output, context) { re
                     case "com.amazonaws.sns#InvalidParameterException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(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);
         }
     });
 }); };
@@ -2590,16 +2080,16 @@ export var deserializeAws_queryOptInPhoneNumberCommand = function (output, conte
     });
 }); };
 var deserializeAws_queryOptInPhoneNumberCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2614,40 +2104,22 @@ var deserializeAws_queryOptInPhoneNumberCommandError = function (output, context
                     case "com.amazonaws.sns#ThrottledException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryThrottledExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryThrottledExceptionResponse(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);
         }
     });
 }); };
@@ -2670,16 +2142,16 @@ export var deserializeAws_queryPublishCommand = function (output, context) { ret
     });
 }); };
 var deserializeAws_queryPublishCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, parsedBody, message;
-    var _s;
-    return __generator(this, function (_t) {
-        switch (_t.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _s = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_s.body = _t.sent(), _s)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2714,100 +2186,42 @@ var deserializeAws_queryPublishCommandError = function (output, context) { retur
                     case "com.amazonaws.sns#PlatformApplicationDisabledException": return [3, 28];
                 }
                 return [3, 30];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_queryEndpointDisabledExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_queryInvalidParameterValueExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_queryInvalidSecurityExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_queryKMSAccessDeniedExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_queryKMSDisabledExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_queryKMSInvalidStateExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_queryKMSNotFoundExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 22:
-                _o = [{}];
-                return [4, deserializeAws_queryKMSOptInRequiredResponse(parsedOutput, context)];
-            case 23:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _o.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 24:
-                _p = [{}];
-                return [4, deserializeAws_queryKMSThrottlingExceptionResponse(parsedOutput, context)];
-            case 25:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _p.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 26:
-                _q = [{}];
-                return [4, deserializeAws_queryNotFoundExceptionResponse(parsedOutput, context)];
-            case 27:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _q.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
-            case 28:
-                _r = [{}];
-                return [4, deserializeAws_queryPlatformApplicationDisabledExceptionResponse(parsedOutput, context)];
-            case 29:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _r.concat([(_t.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 31];
+            case 2: return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryEndpointDisabledExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryInvalidParameterValueExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_queryInvalidSecurityExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_queryKMSAccessDeniedExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_queryKMSDisabledExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_queryKMSInvalidStateExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_queryKMSNotFoundExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
+            case 22: return [4, deserializeAws_queryKMSOptInRequiredResponse(parsedOutput, context)];
+            case 23: throw _d.sent();
+            case 24: return [4, deserializeAws_queryKMSThrottlingExceptionResponse(parsedOutput, context)];
+            case 25: throw _d.sent();
+            case 26: return [4, deserializeAws_queryNotFoundExceptionResponse(parsedOutput, context)];
+            case 27: throw _d.sent();
+            case 28: return [4, deserializeAws_queryPlatformApplicationDisabledExceptionResponse(parsedOutput, context)];
+            case 29: throw _d.sent();
             case 30:
                 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) });
-                _t.label = 31;
-            case 31:
-                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);
         }
     });
 }); };
@@ -2830,16 +2244,16 @@ export var deserializeAws_queryPublishBatchCommand = function (output, context)
     });
 }); };
 var deserializeAws_queryPublishBatchCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, parsedBody, message;
-    var _x;
-    return __generator(this, function (_y) {
-        switch (_y.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _x = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_x.body = _y.sent(), _x)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2884,130 +2298,52 @@ var deserializeAws_queryPublishBatchCommandError = function (output, context) {
                     case "com.amazonaws.sns#TooManyEntriesInBatchRequestException": return [3, 38];
                 }
                 return [3, 40];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_queryBatchEntryIdsNotDistinctExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_queryBatchRequestTooLongExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_queryEmptyBatchRequestExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_queryEndpointDisabledExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_queryInvalidBatchEntryIdExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_queryInvalidParameterValueExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_queryInvalidSecurityExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 22:
-                _o = [{}];
-                return [4, deserializeAws_queryKMSAccessDeniedExceptionResponse(parsedOutput, context)];
-            case 23:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _o.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 24:
-                _p = [{}];
-                return [4, deserializeAws_queryKMSDisabledExceptionResponse(parsedOutput, context)];
-            case 25:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _p.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 26:
-                _q = [{}];
-                return [4, deserializeAws_queryKMSInvalidStateExceptionResponse(parsedOutput, context)];
-            case 27:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _q.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 28:
-                _r = [{}];
-                return [4, deserializeAws_queryKMSNotFoundExceptionResponse(parsedOutput, context)];
-            case 29:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _r.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 30:
-                _s = [{}];
-                return [4, deserializeAws_queryKMSOptInRequiredResponse(parsedOutput, context)];
-            case 31:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _s.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 32:
-                _t = [{}];
-                return [4, deserializeAws_queryKMSThrottlingExceptionResponse(parsedOutput, context)];
-            case 33:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _t.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 34:
-                _u = [{}];
-                return [4, deserializeAws_queryNotFoundExceptionResponse(parsedOutput, context)];
-            case 35:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _u.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 36:
-                _v = [{}];
-                return [4, deserializeAws_queryPlatformApplicationDisabledExceptionResponse(parsedOutput, context)];
-            case 37:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _v.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
-            case 38:
-                _w = [{}];
-                return [4, deserializeAws_queryTooManyEntriesInBatchRequestExceptionResponse(parsedOutput, context)];
-            case 39:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _w.concat([(_y.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 41];
+            case 2: return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryBatchEntryIdsNotDistinctExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryBatchRequestTooLongExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryEmptyBatchRequestExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryEndpointDisabledExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_queryInvalidBatchEntryIdExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_queryInvalidParameterValueExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_queryInvalidSecurityExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
+            case 22: return [4, deserializeAws_queryKMSAccessDeniedExceptionResponse(parsedOutput, context)];
+            case 23: throw _d.sent();
+            case 24: return [4, deserializeAws_queryKMSDisabledExceptionResponse(parsedOutput, context)];
+            case 25: throw _d.sent();
+            case 26: return [4, deserializeAws_queryKMSInvalidStateExceptionResponse(parsedOutput, context)];
+            case 27: throw _d.sent();
+            case 28: return [4, deserializeAws_queryKMSNotFoundExceptionResponse(parsedOutput, context)];
+            case 29: throw _d.sent();
+            case 30: return [4, deserializeAws_queryKMSOptInRequiredResponse(parsedOutput, context)];
+            case 31: throw _d.sent();
+            case 32: return [4, deserializeAws_queryKMSThrottlingExceptionResponse(parsedOutput, context)];
+            case 33: throw _d.sent();
+            case 34: return [4, deserializeAws_queryNotFoundExceptionResponse(parsedOutput, context)];
+            case 35: throw _d.sent();
+            case 36: return [4, deserializeAws_queryPlatformApplicationDisabledExceptionResponse(parsedOutput, context)];
+            case 37: throw _d.sent();
+            case 38: return [4, deserializeAws_queryTooManyEntriesInBatchRequestExceptionResponse(parsedOutput, context)];
+            case 39: throw _d.sent();
             case 40:
                 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) });
-                _y.label = 41;
-            case 41:
-                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);
         }
     });
 }); };
@@ -3030,16 +2366,16 @@ export var deserializeAws_queryRemovePermissionCommand = function (output, conte
     });
 }); };
 var deserializeAws_queryRemovePermissionCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3054,40 +2390,22 @@ var deserializeAws_queryRemovePermissionCommandError = function (output, context
                     case "com.amazonaws.sns#NotFoundException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -3110,16 +2428,16 @@ export var deserializeAws_querySetEndpointAttributesCommand = function (output,
     });
 }); };
 var deserializeAws_querySetEndpointAttributesCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3134,40 +2452,22 @@ var deserializeAws_querySetEndpointAttributesCommandError = function (output, co
                     case "com.amazonaws.sns#NotFoundException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -3190,16 +2490,16 @@ export var deserializeAws_querySetPlatformApplicationAttributesCommand = functio
     });
 }); };
 var deserializeAws_querySetPlatformApplicationAttributesCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3214,40 +2514,22 @@ var deserializeAws_querySetPlatformApplicationAttributesCommandError = function
                     case "com.amazonaws.sns#NotFoundException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -3270,16 +2552,16 @@ export var deserializeAws_querySetSMSAttributesCommand = function (output, conte
     });
 }); };
 var deserializeAws_querySetSMSAttributesCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3294,40 +2576,22 @@ var deserializeAws_querySetSMSAttributesCommandError = function (output, context
                     case "com.amazonaws.sns#ThrottledException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryThrottledExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryThrottledExceptionResponse(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);
         }
     });
 }); };
@@ -3350,16 +2614,16 @@ export var deserializeAws_querySetSubscriptionAttributesCommand = function (outp
     });
 }); };
 var deserializeAws_querySetSubscriptionAttributesCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3376,46 +2640,24 @@ var deserializeAws_querySetSubscriptionAttributesCommandError = function (output
                     case "com.amazonaws.sns#NotFoundException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryFilterPolicyLimitExceededExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryFilterPolicyLimitExceededExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -3438,16 +2680,16 @@ export var deserializeAws_querySetTopicAttributesCommand = function (output, con
     });
 }); };
 var deserializeAws_querySetTopicAttributesCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3464,46 +2706,24 @@ var deserializeAws_querySetTopicAttributesCommandError = function (output, conte
                     case "com.amazonaws.sns#NotFoundException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryInvalidSecurityExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryInvalidSecurityExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -3526,16 +2746,16 @@ export var deserializeAws_querySubscribeCommand = function (output, context) { r
     });
 }); };
 var deserializeAws_querySubscribeCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, parsedBody, message;
-    var _k;
-    return __generator(this, function (_l) {
-        switch (_l.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _k = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_k.body = _l.sent(), _k)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3556,58 +2776,28 @@ var deserializeAws_querySubscribeCommandError = function (output, context) { ret
                     case "com.amazonaws.sns#SubscriptionLimitExceededException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_queryFilterPolicyLimitExceededExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_queryInvalidSecurityExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_queryNotFoundExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_querySubscriptionLimitExceededExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
+            case 2: return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryFilterPolicyLimitExceededExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryInvalidSecurityExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_queryNotFoundExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_querySubscriptionLimitExceededExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 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) });
-                _l.label = 17;
-            case 17:
-                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);
         }
     });
 }); };
@@ -3630,16 +2820,16 @@ export var deserializeAws_queryTagResourceCommand = function (output, context) {
     });
 }); };
 var deserializeAws_queryTagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, parsedBody, message;
-    var _k;
-    return __generator(this, function (_l) {
-        switch (_l.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _k = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_k.body = _l.sent(), _k)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3660,58 +2850,28 @@ var deserializeAws_queryTagResourceCommandError = function (output, context) { r
                     case "com.amazonaws.sns#TagPolicyException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_queryConcurrentAccessExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_queryStaleTagExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_queryTagLimitExceededExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_queryTagPolicyExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
+            case 2: return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryConcurrentAccessExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryStaleTagExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_queryTagLimitExceededExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_queryTagPolicyExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 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) });
-                _l.label = 17;
-            case 17:
-                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);
         }
     });
 }); };
@@ -3734,16 +2894,16 @@ export var deserializeAws_queryUnsubscribeCommand = function (output, context) {
     });
 }); };
 var deserializeAws_queryUnsubscribeCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3760,46 +2920,24 @@ var deserializeAws_queryUnsubscribeCommandError = function (output, context) { r
                     case "com.amazonaws.sns#NotFoundException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(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_queryInternalErrorExceptionResponse(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_queryInvalidParameterExceptionResponse(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_queryInvalidSecurityExceptionResponse(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_queryNotFoundExceptionResponse(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_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryInvalidSecurityExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryNotFoundExceptionResponse(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);
         }
     });
 }); };
@@ -3822,16 +2960,16 @@ export var deserializeAws_queryUntagResourceCommand = function (output, context)
     });
 }); };
 var deserializeAws_queryUntagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, parsedBody, message;
-    var _k;
-    return __generator(this, function (_l) {
-        switch (_l.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _k = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_k.body = _l.sent(), _k)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3852,58 +2990,28 @@ var deserializeAws_queryUntagResourceCommandError = function (output, context) {
                     case "com.amazonaws.sns#TagPolicyException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_queryConcurrentAccessExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_queryStaleTagExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_queryTagLimitExceededExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_queryTagPolicyExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
+            case 2: return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryConcurrentAccessExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryStaleTagExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_queryTagLimitExceededExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_queryTagPolicyExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 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) });
-                _l.label = 17;
-            case 17:
-                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);
         }
     });
 }); };
@@ -3926,16 +3034,16 @@ export var deserializeAws_queryVerifySMSSandboxPhoneNumberCommand = function (ou
     });
 }); };
 var deserializeAws_queryVerifySMSSandboxPhoneNumberCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3954,341 +3062,315 @@ var deserializeAws_queryVerifySMSSandboxPhoneNumberCommandError = function (outp
                     case "com.amazonaws.sns#VerificationException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_queryThrottledExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_queryVerificationExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_queryAuthorizationErrorExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInternalErrorExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryInvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryThrottledExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_queryVerificationExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 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) });
-                _k.label = 15;
-            case 15:
-                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_queryAuthorizationErrorExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryAuthorizationErrorException(body.Error, context);
-        contents = __assign({ name: "AuthorizationErrorException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new AuthorizationErrorException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryBatchEntryIdsNotDistinctExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryBatchEntryIdsNotDistinctException(body.Error, context);
-        contents = __assign({ name: "BatchEntryIdsNotDistinctException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new BatchEntryIdsNotDistinctException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryBatchRequestTooLongExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryBatchRequestTooLongException(body.Error, context);
-        contents = __assign({ name: "BatchRequestTooLongException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new BatchRequestTooLongException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryConcurrentAccessExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryConcurrentAccessException(body.Error, context);
-        contents = __assign({ name: "ConcurrentAccessException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ConcurrentAccessException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryEmptyBatchRequestExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryEmptyBatchRequestException(body.Error, context);
-        contents = __assign({ name: "EmptyBatchRequestException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new EmptyBatchRequestException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryEndpointDisabledExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryEndpointDisabledException(body.Error, context);
-        contents = __assign({ name: "EndpointDisabledException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new EndpointDisabledException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryFilterPolicyLimitExceededExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryFilterPolicyLimitExceededException(body.Error, context);
-        contents = __assign({ name: "FilterPolicyLimitExceededException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new FilterPolicyLimitExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryInternalErrorExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryInternalErrorException(body.Error, context);
-        contents = __assign({ name: "InternalErrorException", $fault: "server", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InternalErrorException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryInvalidBatchEntryIdExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryInvalidBatchEntryIdException(body.Error, context);
-        contents = __assign({ name: "InvalidBatchEntryIdException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidBatchEntryIdException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryInvalidParameterExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryInvalidParameterException(body.Error, context);
-        contents = __assign({ name: "InvalidParameterException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidParameterException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryInvalidParameterValueExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryInvalidParameterValueException(body.Error, context);
-        contents = __assign({ name: "InvalidParameterValueException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidParameterValueException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryInvalidSecurityExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryInvalidSecurityException(body.Error, context);
-        contents = __assign({ name: "InvalidSecurityException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidSecurityException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryKMSAccessDeniedExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryKMSAccessDeniedException(body.Error, context);
-        contents = __assign({ name: "KMSAccessDeniedException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSAccessDeniedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryKMSDisabledExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryKMSDisabledException(body.Error, context);
-        contents = __assign({ name: "KMSDisabledException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSDisabledException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryKMSInvalidStateExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryKMSInvalidStateException(body.Error, context);
-        contents = __assign({ name: "KMSInvalidStateException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSInvalidStateException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryKMSNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryKMSNotFoundException(body.Error, context);
-        contents = __assign({ name: "KMSNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryKMSOptInRequiredResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryKMSOptInRequired(body.Error, context);
-        contents = __assign({ name: "KMSOptInRequired", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSOptInRequired(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryKMSThrottlingExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryKMSThrottlingException(body.Error, context);
-        contents = __assign({ name: "KMSThrottlingException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSThrottlingException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryNotFoundException(body.Error, context);
-        contents = __assign({ name: "NotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new NotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryOptedOutExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryOptedOutException(body.Error, context);
-        contents = __assign({ name: "OptedOutException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new OptedOutException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryPlatformApplicationDisabledExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryPlatformApplicationDisabledException(body.Error, context);
-        contents = __assign({ name: "PlatformApplicationDisabledException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new PlatformApplicationDisabledException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryResourceNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryResourceNotFoundException(body.Error, context);
-        contents = __assign({ name: "ResourceNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ResourceNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryStaleTagExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryStaleTagException(body.Error, context);
-        contents = __assign({ name: "StaleTagException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new StaleTagException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_querySubscriptionLimitExceededExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_querySubscriptionLimitExceededException(body.Error, context);
-        contents = __assign({ name: "SubscriptionLimitExceededException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new SubscriptionLimitExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryTagLimitExceededExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryTagLimitExceededException(body.Error, context);
-        contents = __assign({ name: "TagLimitExceededException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TagLimitExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryTagPolicyExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryTagPolicyException(body.Error, context);
-        contents = __assign({ name: "TagPolicyException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TagPolicyException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryThrottledExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryThrottledException(body.Error, context);
-        contents = __assign({ name: "ThrottledException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ThrottledException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryTooManyEntriesInBatchRequestExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryTooManyEntriesInBatchRequestException(body.Error, context);
-        contents = __assign({ name: "TooManyEntriesInBatchRequestException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TooManyEntriesInBatchRequestException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryTopicLimitExceededExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryTopicLimitExceededException(body.Error, context);
-        contents = __assign({ name: "TopicLimitExceededException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TopicLimitExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryUserErrorExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryUserErrorException(body.Error, context);
-        contents = __assign({ name: "UserErrorException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new UserErrorException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryValidationExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryValidationException(body.Error, context);
-        contents = __assign({ name: "ValidationException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ValidationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryVerificationExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryVerificationException(body.Error, context);
-        contents = __assign({ name: "VerificationException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new VerificationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var serializeAws_queryActionsList = function (input, context) {