@aws-sdk/client-cloudtrail 3.50.0 → 3.53.0

package/dist-es/protocols/Aws_json1_1.js

@@ -1,6 +1,8 @@
 import { __assign, __awaiter, __generator, __read } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectString as __expectString, parseEpochTimestamp as __parseEpochTimestamp, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectString as __expectString, parseEpochTimestamp as __parseEpochTimestamp, } from "@aws-sdk/smithy-client";
+import { CloudTrailServiceException as __BaseException } from "../models/CloudTrailServiceException";
+import { CloudTrailAccessNotEnabledException, CloudTrailARNInvalidException, CloudTrailInvalidClientTokenIdException, CloudWatchLogsDeliveryUnavailableException, ConflictException, EventDataStoreAlreadyExistsException, EventDataStoreARNInvalidException, EventDataStoreMaxLimitExceededException, EventDataStoreNotFoundException, EventDataStoreTerminationProtectedException, InactiveEventDataStoreException, InactiveQueryException, InsightNotEnabledException, InsufficientDependencyServiceAccessPermissionException, InsufficientEncryptionPolicyException, InsufficientS3BucketPolicyException, InsufficientSnsTopicPolicyException, InvalidCloudWatchLogsLogGroupArnException, InvalidCloudWatchLogsRoleArnException, InvalidDateRangeException, InvalidEventCategoryException, InvalidEventDataStoreStatusException, InvalidEventSelectorsException, InvalidHomeRegionException, InvalidInsightSelectorsException, InvalidKmsKeyIdException, InvalidLookupAttributesException, InvalidMaxResultsException, InvalidNextTokenException, InvalidParameterCombinationException, InvalidParameterException, InvalidQueryStatementException, InvalidQueryStatusException, InvalidS3BucketNameException, InvalidS3PrefixException, InvalidSnsTopicNameException, InvalidTagParameterException, InvalidTimeRangeException, InvalidTokenException, InvalidTrailNameException, KmsException, KmsKeyDisabledException, KmsKeyNotFoundException, MaxConcurrentQueriesException, MaximumNumberOfTrailsExceededException, NotOrganizationMasterAccountException, OperationNotPermittedException, OrganizationNotInAllFeaturesModeException, OrganizationsNotInUseException, QueryIdNotFoundException, ResourceNotFoundException, ResourceTypeNotSupportedException, S3BucketDoesNotExistException, TagsLimitExceededException, TrailAlreadyExistsException, TrailNotFoundException, TrailNotProvidedException, UnsupportedOperationException, } from "../models/models_0";
 export var serializeAws_json1_1AddTagsCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
     var headers, body;
     return __generator(this, function (_a) {
@@ -339,16 +341,16 @@ export var deserializeAws_json1_1AddTagsCommand = function (output, context) { r
     });
 }); };
 var deserializeAws_json1_1AddTagsCommandError = 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, parsedBody, message;
-    var _q;
-    return __generator(this, function (_r) {
-        switch (_r.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _q = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_q.body = _r.sent(), _q)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -379,88 +381,38 @@ var deserializeAws_json1_1AddTagsCommandError = function (output, context) { ret
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 24];
                 }
                 return [3, 26];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_json1_1ResourceTypeNotSupportedExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 22:
-                _o = [{}];
-                return [4, deserializeAws_json1_1TagsLimitExceededExceptionResponse(parsedOutput, context)];
-            case 23:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _o.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 24:
-                _p = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 25:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _p.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
+            case 2: return [4, deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1ResourceTypeNotSupportedExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
+            case 22: return [4, deserializeAws_json1_1TagsLimitExceededExceptionResponse(parsedOutput, context)];
+            case 23: throw _d.sent();
+            case 24: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 25: throw _d.sent();
             case 26:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _r.label = 27;
-            case 27:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -483,16 +435,16 @@ export var deserializeAws_json1_1CancelQueryCommand = function (output, context)
     });
 }); };
 var deserializeAws_json1_1CancelQueryCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -517,70 +469,32 @@ var deserializeAws_json1_1CancelQueryCommandError = function (output, context) {
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 18];
                 }
                 return [3, 20];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ConflictExceptionResponse(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_json1_1EventDataStoreARNInvalidExceptionResponse(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_json1_1EventDataStoreNotFoundExceptionResponse(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_json1_1InactiveEventDataStoreExceptionResponse(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_json1_1InactiveQueryExceptionResponse(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_json1_1InvalidParameterExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1QueryIdNotFoundExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1ConflictExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InactiveQueryExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1QueryIdNotFoundExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
             case 20:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -603,16 +517,16 @@ export var deserializeAws_json1_1CreateEventDataStoreCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1CreateEventDataStoreCommandError = 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, parsedBody, message;
-    var _q;
-    return __generator(this, function (_r) {
-        switch (_r.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _q = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_q.body = _r.sent(), _q)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -643,88 +557,38 @@ var deserializeAws_json1_1CreateEventDataStoreCommandError = function (output, c
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 24];
                 }
                 return [3, 26];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreAlreadyExistsExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreMaxLimitExceededExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 22:
-                _o = [{}];
-                return [4, deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)];
-            case 23:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _o.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 24:
-                _p = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 25:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _p.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
+            case 2: return [4, deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1EventDataStoreAlreadyExistsExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1EventDataStoreMaxLimitExceededExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
+            case 22: return [4, deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)];
+            case 23: throw _d.sent();
+            case 24: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 25: throw _d.sent();
             case 26:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _r.label = 27;
-            case 27:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -747,16 +611,16 @@ export var deserializeAws_json1_1CreateTrailCommand = function (output, context)
     });
 }); };
 var deserializeAws_json1_1CreateTrailCommandError = 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, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, parsedBody, message;
-    var _7;
-    return __generator(this, function (_8) {
-        switch (_8.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _7 = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_7.body = _8.sent(), _7)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -821,190 +685,72 @@ var deserializeAws_json1_1CreateTrailCommandError = function (output, context) {
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 58];
                 }
                 return [3, 60];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1CloudTrailInvalidClientTokenIdExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1CloudWatchLogsDeliveryUnavailableExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1InsufficientSnsTopicPolicyExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_json1_1InvalidCloudWatchLogsLogGroupArnExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_json1_1InvalidCloudWatchLogsRoleArnExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 22:
-                _o = [{}];
-                return [4, deserializeAws_json1_1InvalidKmsKeyIdExceptionResponse(parsedOutput, context)];
-            case 23:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _o.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 24:
-                _p = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterCombinationExceptionResponse(parsedOutput, context)];
-            case 25:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _p.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 26:
-                _q = [{}];
-                return [4, deserializeAws_json1_1InvalidS3BucketNameExceptionResponse(parsedOutput, context)];
-            case 27:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _q.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 28:
-                _r = [{}];
-                return [4, deserializeAws_json1_1InvalidS3PrefixExceptionResponse(parsedOutput, context)];
-            case 29:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _r.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 30:
-                _s = [{}];
-                return [4, deserializeAws_json1_1InvalidSnsTopicNameExceptionResponse(parsedOutput, context)];
-            case 31:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _s.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 32:
-                _t = [{}];
-                return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
-            case 33:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _t.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 34:
-                _u = [{}];
-                return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
-            case 35:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _u.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 36:
-                _v = [{}];
-                return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
-            case 37:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _v.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 38:
-                _w = [{}];
-                return [4, deserializeAws_json1_1KmsKeyDisabledExceptionResponse(parsedOutput, context)];
-            case 39:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _w.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 40:
-                _x = [{}];
-                return [4, deserializeAws_json1_1KmsKeyNotFoundExceptionResponse(parsedOutput, context)];
-            case 41:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _x.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 42:
-                _y = [{}];
-                return [4, deserializeAws_json1_1MaximumNumberOfTrailsExceededExceptionResponse(parsedOutput, context)];
-            case 43:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _y.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 44:
-                _z = [{}];
-                return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
-            case 45:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _z.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 46:
-                _0 = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 47:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _0.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 48:
-                _1 = [{}];
-                return [4, deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)];
-            case 49:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _1.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 50:
-                _2 = [{}];
-                return [4, deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)];
-            case 51:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _2.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 52:
-                _3 = [{}];
-                return [4, deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse(parsedOutput, context)];
-            case 53:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _3.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 54:
-                _4 = [{}];
-                return [4, deserializeAws_json1_1TrailAlreadyExistsExceptionResponse(parsedOutput, context)];
-            case 55:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _4.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 56:
-                _5 = [{}];
-                return [4, deserializeAws_json1_1TrailNotProvidedExceptionResponse(parsedOutput, context)];
-            case 57:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _5.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
-            case 58:
-                _6 = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 59:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _6.concat([(_8.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 61];
+            case 2: return [4, deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1CloudTrailInvalidClientTokenIdExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1CloudWatchLogsDeliveryUnavailableExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1InsufficientSnsTopicPolicyExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1InvalidCloudWatchLogsLogGroupArnExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1InvalidCloudWatchLogsRoleArnExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
+            case 22: return [4, deserializeAws_json1_1InvalidKmsKeyIdExceptionResponse(parsedOutput, context)];
+            case 23: throw _d.sent();
+            case 24: return [4, deserializeAws_json1_1InvalidParameterCombinationExceptionResponse(parsedOutput, context)];
+            case 25: throw _d.sent();
+            case 26: return [4, deserializeAws_json1_1InvalidS3BucketNameExceptionResponse(parsedOutput, context)];
+            case 27: throw _d.sent();
+            case 28: return [4, deserializeAws_json1_1InvalidS3PrefixExceptionResponse(parsedOutput, context)];
+            case 29: throw _d.sent();
+            case 30: return [4, deserializeAws_json1_1InvalidSnsTopicNameExceptionResponse(parsedOutput, context)];
+            case 31: throw _d.sent();
+            case 32: return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
+            case 33: throw _d.sent();
+            case 34: return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 35: throw _d.sent();
+            case 36: return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
+            case 37: throw _d.sent();
+            case 38: return [4, deserializeAws_json1_1KmsKeyDisabledExceptionResponse(parsedOutput, context)];
+            case 39: throw _d.sent();
+            case 40: return [4, deserializeAws_json1_1KmsKeyNotFoundExceptionResponse(parsedOutput, context)];
+            case 41: throw _d.sent();
+            case 42: return [4, deserializeAws_json1_1MaximumNumberOfTrailsExceededExceptionResponse(parsedOutput, context)];
+            case 43: throw _d.sent();
+            case 44: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 45: throw _d.sent();
+            case 46: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 47: throw _d.sent();
+            case 48: return [4, deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)];
+            case 49: throw _d.sent();
+            case 50: return [4, deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)];
+            case 51: throw _d.sent();
+            case 52: return [4, deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse(parsedOutput, context)];
+            case 53: throw _d.sent();
+            case 54: return [4, deserializeAws_json1_1TrailAlreadyExistsExceptionResponse(parsedOutput, context)];
+            case 55: throw _d.sent();
+            case 56: return [4, deserializeAws_json1_1TrailNotProvidedExceptionResponse(parsedOutput, context)];
+            case 57: throw _d.sent();
+            case 58: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 59: throw _d.sent();
             case 60:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _8.label = 61;
-            case 61:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1027,16 +773,16 @@ export var deserializeAws_json1_1DeleteEventDataStoreCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1DeleteEventDataStoreCommandError = 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, parsedBody, message;
-    var _l;
-    return __generator(this, function (_m) {
-        switch (_m.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _l = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_l.body = _m.sent(), _l)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1059,64 +805,30 @@ var deserializeAws_json1_1DeleteEventDataStoreCommandError = function (output, c
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 16];
                 }
                 return [3, 18];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreTerminationProtectedExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
+            case 2: return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1EventDataStoreTerminationProtectedExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
             case 18:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _m.label = 19;
-            case 19:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1139,16 +851,16 @@ export var deserializeAws_json1_1DeleteTrailCommand = function (output, context)
     });
 }); };
 var deserializeAws_json1_1DeleteTrailCommandError = 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, parsedBody, message;
-    var _l;
-    return __generator(this, function (_m) {
-        switch (_m.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _l = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_l.body = _m.sent(), _l)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1171,64 +883,30 @@ var deserializeAws_json1_1DeleteTrailCommandError = function (output, context) {
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 16];
                 }
                 return [3, 18];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
+            case 2: return [4, deserializeAws_json1_1ConflictExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
             case 18:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _m.label = 19;
-            case 19:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1251,16 +929,16 @@ export var deserializeAws_json1_1DescribeQueryCommand = function (output, contex
     });
 }); };
 var deserializeAws_json1_1DescribeQueryCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1281,58 +959,28 @@ var deserializeAws_json1_1DescribeQueryCommandError = function (output, context)
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(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_json1_1EventDataStoreNotFoundExceptionResponse(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_json1_1InactiveEventDataStoreExceptionResponse(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_json1_1InvalidParameterExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1QueryIdNotFoundExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1QueryIdNotFoundExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1355,16 +1003,16 @@ export var deserializeAws_json1_1DescribeTrailsCommand = function (output, conte
     });
 }); };
 var deserializeAws_json1_1DescribeTrailsCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1377,34 +1025,20 @@ var deserializeAws_json1_1DescribeTrailsCommandError = function (output, context
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1427,16 +1061,16 @@ export var deserializeAws_json1_1GetEventDataStoreCommand = function (output, co
     });
 }); };
 var deserializeAws_json1_1GetEventDataStoreCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1453,46 +1087,24 @@ var deserializeAws_json1_1GetEventDataStoreCommandError = function (output, cont
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(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_json1_1EventDataStoreNotFoundExceptionResponse(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_json1_1InvalidParameterExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1515,16 +1127,16 @@ export var deserializeAws_json1_1GetEventSelectorsCommand = function (output, co
     });
 }); };
 var deserializeAws_json1_1GetEventSelectorsCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1539,40 +1151,22 @@ var deserializeAws_json1_1GetEventSelectorsCommandError = function (output, cont
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1TrailNotFoundExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1595,16 +1189,16 @@ export var deserializeAws_json1_1GetInsightSelectorsCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1GetInsightSelectorsCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1621,46 +1215,24 @@ var deserializeAws_json1_1GetInsightSelectorsCommandError = function (output, co
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InsightNotEnabledExceptionResponse(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_json1_1InvalidTrailNameExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1TrailNotFoundExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1InsightNotEnabledExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1683,16 +1255,16 @@ export var deserializeAws_json1_1GetQueryResultsCommand = function (output, cont
     });
 }); };
 var deserializeAws_json1_1GetQueryResultsCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1717,70 +1289,32 @@ var deserializeAws_json1_1GetQueryResultsCommandError = function (output, contex
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 18];
                 }
                 return [3, 20];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(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_json1_1EventDataStoreNotFoundExceptionResponse(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_json1_1InactiveEventDataStoreExceptionResponse(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_json1_1InvalidMaxResultsExceptionResponse(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_json1_1InvalidNextTokenExceptionResponse(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_json1_1InvalidParameterExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1QueryIdNotFoundExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1QueryIdNotFoundExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
             case 20:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1803,16 +1337,16 @@ export var deserializeAws_json1_1GetTrailCommand = function (output, context) {
     });
 }); };
 var deserializeAws_json1_1GetTrailCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1827,40 +1361,22 @@ var deserializeAws_json1_1GetTrailCommandError = function (output, context) { re
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1TrailNotFoundExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1883,16 +1399,16 @@ export var deserializeAws_json1_1GetTrailStatusCommand = function (output, conte
     });
 }); };
 var deserializeAws_json1_1GetTrailStatusCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1907,40 +1423,22 @@ var deserializeAws_json1_1GetTrailStatusCommandError = function (output, context
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1TrailNotFoundExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1963,16 +1461,16 @@ export var deserializeAws_json1_1ListEventDataStoresCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1ListEventDataStoresCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1987,40 +1485,22 @@ var deserializeAws_json1_1ListEventDataStoresCommandError = function (output, co
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidMaxResultsExceptionResponse(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_json1_1InvalidNextTokenExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2043,16 +1523,16 @@ export var deserializeAws_json1_1ListPublicKeysCommand = function (output, conte
     });
 }); };
 var deserializeAws_json1_1ListPublicKeysCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2067,40 +1547,22 @@ var deserializeAws_json1_1ListPublicKeysCommandError = function (output, context
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidTimeRangeExceptionResponse(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_json1_1InvalidTokenExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1InvalidTimeRangeExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidTokenExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2123,16 +1585,16 @@ export var deserializeAws_json1_1ListQueriesCommand = function (output, context)
     });
 }); };
 var deserializeAws_json1_1ListQueriesCommandError = 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, parsedBody, message;
-    var _o;
-    return __generator(this, function (_p) {
-        switch (_p.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _o = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_o.body = _p.sent(), _o)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2159,76 +1621,34 @@ var deserializeAws_json1_1ListQueriesCommandError = function (output, context) {
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 20];
                 }
                 return [3, 22];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1InvalidDateRangeExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1InvalidQueryStatusExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
+            case 2: return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InvalidDateRangeExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1InvalidQueryStatusExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
             case 22:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _p.label = 23;
-            case 23:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2251,16 +1671,16 @@ export var deserializeAws_json1_1ListTagsCommand = function (output, context) {
     });
 }); };
 var deserializeAws_json1_1ListTagsCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2285,70 +1705,32 @@ var deserializeAws_json1_1ListTagsCommandError = function (output, context) { re
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 18];
                 }
                 return [3, 20];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse(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_json1_1EventDataStoreNotFoundExceptionResponse(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_json1_1InactiveEventDataStoreExceptionResponse(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_json1_1InvalidTokenExceptionResponse(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_json1_1InvalidTrailNameExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1ResourceNotFoundExceptionResponse(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_json1_1ResourceTypeNotSupportedExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1CloudTrailARNInvalidExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InvalidTokenExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1ResourceTypeNotSupportedExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
             case 20:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2371,16 +1753,16 @@ export var deserializeAws_json1_1ListTrailsCommand = function (output, context)
     });
 }); };
 var deserializeAws_json1_1ListTrailsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, parsedBody, message;
-    var _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _e = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_e.body = _f.sent(), _e)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2391,28 +1773,18 @@ var deserializeAws_json1_1ListTrailsCommandError = function (output, context) {
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_f.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 7];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_f.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 7];
+            case 2: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2435,16 +1807,16 @@ export var deserializeAws_json1_1LookupEventsCommand = function (output, context
     });
 }); };
 var deserializeAws_json1_1LookupEventsCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2465,58 +1837,28 @@ var deserializeAws_json1_1LookupEventsCommandError = function (output, context)
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidEventCategoryExceptionResponse(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_json1_1InvalidLookupAttributesExceptionResponse(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_json1_1InvalidMaxResultsExceptionResponse(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_json1_1InvalidNextTokenExceptionResponse(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_json1_1InvalidTimeRangeExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1InvalidEventCategoryExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidLookupAttributesExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InvalidMaxResultsExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InvalidNextTokenExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InvalidTimeRangeExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2539,16 +1881,16 @@ export var deserializeAws_json1_1PutEventSelectorsCommand = function (output, co
     });
 }); };
 var deserializeAws_json1_1PutEventSelectorsCommandError = 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, parsedBody, message;
-    var _l;
-    return __generator(this, function (_m) {
-        switch (_m.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _l = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_l.body = _m.sent(), _l)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2571,64 +1913,30 @@ var deserializeAws_json1_1PutEventSelectorsCommandError = function (output, cont
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 16];
                 }
                 return [3, 18];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidEventSelectorsExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
+            case 2: return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidEventSelectorsExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
             case 18:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _m.label = 19;
-            case 19:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2651,16 +1959,16 @@ export var deserializeAws_json1_1PutInsightSelectorsCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1PutInsightSelectorsCommandError = 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, parsedBody, message;
-    var _p;
-    return __generator(this, function (_q) {
-        switch (_q.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _p = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_p.body = _q.sent(), _p)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2689,82 +1997,36 @@ var deserializeAws_json1_1PutInsightSelectorsCommandError = function (output, co
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 22];
                 }
                 return [3, 24];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1InvalidInsightSelectorsExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 22:
-                _o = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 23:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _o.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
+            case 2: return [4, deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InvalidInsightSelectorsExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
+            case 22: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 23: throw _d.sent();
             case 24:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _q.label = 25;
-            case 25:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2787,16 +2049,16 @@ export var deserializeAws_json1_1RemoveTagsCommand = function (output, context)
     });
 }); };
 var deserializeAws_json1_1RemoveTagsCommandError = 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, parsedBody, message;
-    var _o;
-    return __generator(this, function (_p) {
-        switch (_p.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _o = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_o.body = _p.sent(), _o)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2823,76 +2085,34 @@ var deserializeAws_json1_1RemoveTagsCommandError = function (output, context) {
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 20];
                 }
                 return [3, 22];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_json1_1ResourceTypeNotSupportedExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
+            case 2: return [4, deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InvalidTagParameterExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1ResourceTypeNotSupportedExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
             case 22:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _p.label = 23;
-            case 23:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2915,16 +2135,16 @@ export var deserializeAws_json1_1RestoreEventDataStoreCommand = function (output
     });
 }); };
 var deserializeAws_json1_1RestoreEventDataStoreCommandError = 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, parsedBody, message;
-    var _q;
-    return __generator(this, function (_r) {
-        switch (_r.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _q = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_q.body = _r.sent(), _q)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2955,88 +2175,38 @@ var deserializeAws_json1_1RestoreEventDataStoreCommandError = function (output,
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 24];
                 }
                 return [3, 26];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreMaxLimitExceededExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1InvalidEventDataStoreStatusExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 22:
-                _o = [{}];
-                return [4, deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)];
-            case 23:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _o.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
-            case 24:
-                _p = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 25:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _p.concat([(_r.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 27];
+            case 2: return [4, deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1EventDataStoreMaxLimitExceededExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1InvalidEventDataStoreStatusExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
+            case 22: return [4, deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)];
+            case 23: throw _d.sent();
+            case 24: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 25: throw _d.sent();
             case 26:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _r.label = 27;
-            case 27:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3059,16 +2229,16 @@ export var deserializeAws_json1_1StartLoggingCommand = function (output, context
     });
 }); };
 var deserializeAws_json1_1StartLoggingCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3089,58 +2259,28 @@ var deserializeAws_json1_1StartLoggingCommandError = function (output, context)
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(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_json1_1InvalidHomeRegionExceptionResponse(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_json1_1InvalidTrailNameExceptionResponse(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_json1_1NotOrganizationMasterAccountExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1TrailNotFoundExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3163,16 +2303,16 @@ export var deserializeAws_json1_1StartQueryCommand = function (output, context)
     });
 }); };
 var deserializeAws_json1_1StartQueryCommandError = 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, parsedBody, message;
-    var _l;
-    return __generator(this, function (_m) {
-        switch (_m.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _l = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_l.body = _m.sent(), _l)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3195,64 +2335,30 @@ var deserializeAws_json1_1StartQueryCommandError = function (output, context) {
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 16];
                 }
                 return [3, 18];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1InvalidQueryStatementExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1MaxConcurrentQueriesExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_m.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 19];
+            case 2: return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InvalidQueryStatementExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1MaxConcurrentQueriesExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
             case 18:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _m.label = 19;
-            case 19:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3275,16 +2381,16 @@ export var deserializeAws_json1_1StopLoggingCommand = function (output, context)
     });
 }); };
 var deserializeAws_json1_1StopLoggingCommandError = 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 = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3305,58 +2411,28 @@ var deserializeAws_json1_1StopLoggingCommandError = function (output, context) {
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(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_json1_1InvalidHomeRegionExceptionResponse(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_json1_1InvalidTrailNameExceptionResponse(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_json1_1NotOrganizationMasterAccountExceptionResponse(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_json1_1OperationNotPermittedExceptionResponse(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_json1_1TrailNotFoundExceptionResponse(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_json1_1UnsupportedOperationExceptionResponse(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_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3379,16 +2455,16 @@ export var deserializeAws_json1_1UpdateEventDataStoreCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1UpdateEventDataStoreCommandError = 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, parsedBody, message;
-    var _p;
-    return __generator(this, function (_q) {
-        switch (_q.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _p = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_p.body = _q.sent(), _p)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3417,82 +2493,36 @@ var deserializeAws_json1_1UpdateEventDataStoreCommandError = function (output, c
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 22];
                 }
                 return [3, 24];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
-            case 22:
-                _o = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 23:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _o.concat([(_q.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 25];
+            case 2: return [4, deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InactiveEventDataStoreExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1InvalidParameterExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
+            case 22: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 23: throw _d.sent();
             case 24:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _q.label = 25;
-            case 25:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3515,16 +2545,16 @@ export var deserializeAws_json1_1UpdateTrailCommand = function (output, context)
     });
 }); };
 var deserializeAws_json1_1UpdateTrailCommandError = 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, _x, _y, _z, _0, _1, _2, _3, _4, _5, parsedBody, message;
-    var _6;
-    return __generator(this, function (_7) {
-        switch (_7.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _6 = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_6.body = _7.sent(), _6)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3587,707 +2617,593 @@ var deserializeAws_json1_1UpdateTrailCommandError = function (output, context) {
                     case "com.amazonaws.cloudtrail#UnsupportedOperationException": return [3, 56];
                 }
                 return [3, 58];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1CloudTrailInvalidClientTokenIdExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1CloudWatchLogsDeliveryUnavailableExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_json1_1InsufficientSnsTopicPolicyExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_json1_1InvalidCloudWatchLogsLogGroupArnExceptionResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_json1_1InvalidCloudWatchLogsRoleArnExceptionResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_json1_1InvalidEventSelectorsExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 22:
-                _o = [{}];
-                return [4, deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)];
-            case 23:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _o.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 24:
-                _p = [{}];
-                return [4, deserializeAws_json1_1InvalidKmsKeyIdExceptionResponse(parsedOutput, context)];
-            case 25:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _p.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 26:
-                _q = [{}];
-                return [4, deserializeAws_json1_1InvalidParameterCombinationExceptionResponse(parsedOutput, context)];
-            case 27:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _q.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 28:
-                _r = [{}];
-                return [4, deserializeAws_json1_1InvalidS3BucketNameExceptionResponse(parsedOutput, context)];
-            case 29:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _r.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 30:
-                _s = [{}];
-                return [4, deserializeAws_json1_1InvalidS3PrefixExceptionResponse(parsedOutput, context)];
-            case 31:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _s.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 32:
-                _t = [{}];
-                return [4, deserializeAws_json1_1InvalidSnsTopicNameExceptionResponse(parsedOutput, context)];
-            case 33:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _t.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 34:
-                _u = [{}];
-                return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
-            case 35:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _u.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 36:
-                _v = [{}];
-                return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
-            case 37:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _v.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 38:
-                _w = [{}];
-                return [4, deserializeAws_json1_1KmsKeyDisabledExceptionResponse(parsedOutput, context)];
-            case 39:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _w.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 40:
-                _x = [{}];
-                return [4, deserializeAws_json1_1KmsKeyNotFoundExceptionResponse(parsedOutput, context)];
-            case 41:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _x.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 42:
-                _y = [{}];
-                return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
-            case 43:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _y.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 44:
-                _z = [{}];
-                return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
-            case 45:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _z.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 46:
-                _0 = [{}];
-                return [4, deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)];
-            case 47:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _0.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 48:
-                _1 = [{}];
-                return [4, deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)];
-            case 49:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _1.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 50:
-                _2 = [{}];
-                return [4, deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse(parsedOutput, context)];
-            case 51:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _2.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 52:
-                _3 = [{}];
-                return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
-            case 53:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _3.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 54:
-                _4 = [{}];
-                return [4, deserializeAws_json1_1TrailNotProvidedExceptionResponse(parsedOutput, context)];
-            case 55:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _4.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
-            case 56:
-                _5 = [{}];
-                return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
-            case 57:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _5.concat([(_7.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 59];
+            case 2: return [4, deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1CloudTrailInvalidClientTokenIdExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1CloudWatchLogsDeliveryUnavailableExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1InsufficientSnsTopicPolicyExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1InvalidCloudWatchLogsLogGroupArnExceptionResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1InvalidCloudWatchLogsRoleArnExceptionResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1InvalidEventSelectorsExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
+            case 22: return [4, deserializeAws_json1_1InvalidHomeRegionExceptionResponse(parsedOutput, context)];
+            case 23: throw _d.sent();
+            case 24: return [4, deserializeAws_json1_1InvalidKmsKeyIdExceptionResponse(parsedOutput, context)];
+            case 25: throw _d.sent();
+            case 26: return [4, deserializeAws_json1_1InvalidParameterCombinationExceptionResponse(parsedOutput, context)];
+            case 27: throw _d.sent();
+            case 28: return [4, deserializeAws_json1_1InvalidS3BucketNameExceptionResponse(parsedOutput, context)];
+            case 29: throw _d.sent();
+            case 30: return [4, deserializeAws_json1_1InvalidS3PrefixExceptionResponse(parsedOutput, context)];
+            case 31: throw _d.sent();
+            case 32: return [4, deserializeAws_json1_1InvalidSnsTopicNameExceptionResponse(parsedOutput, context)];
+            case 33: throw _d.sent();
+            case 34: return [4, deserializeAws_json1_1InvalidTrailNameExceptionResponse(parsedOutput, context)];
+            case 35: throw _d.sent();
+            case 36: return [4, deserializeAws_json1_1KmsExceptionResponse(parsedOutput, context)];
+            case 37: throw _d.sent();
+            case 38: return [4, deserializeAws_json1_1KmsKeyDisabledExceptionResponse(parsedOutput, context)];
+            case 39: throw _d.sent();
+            case 40: return [4, deserializeAws_json1_1KmsKeyNotFoundExceptionResponse(parsedOutput, context)];
+            case 41: throw _d.sent();
+            case 42: return [4, deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse(parsedOutput, context)];
+            case 43: throw _d.sent();
+            case 44: return [4, deserializeAws_json1_1OperationNotPermittedExceptionResponse(parsedOutput, context)];
+            case 45: throw _d.sent();
+            case 46: return [4, deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse(parsedOutput, context)];
+            case 47: throw _d.sent();
+            case 48: return [4, deserializeAws_json1_1OrganizationsNotInUseExceptionResponse(parsedOutput, context)];
+            case 49: throw _d.sent();
+            case 50: return [4, deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse(parsedOutput, context)];
+            case 51: throw _d.sent();
+            case 52: return [4, deserializeAws_json1_1TrailNotFoundExceptionResponse(parsedOutput, context)];
+            case 53: throw _d.sent();
+            case 54: return [4, deserializeAws_json1_1TrailNotProvidedExceptionResponse(parsedOutput, context)];
+            case 55: throw _d.sent();
+            case 56: return [4, deserializeAws_json1_1UnsupportedOperationExceptionResponse(parsedOutput, context)];
+            case 57: throw _d.sent();
             case 58:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _7.label = 59;
-            case 59:
-                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.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
 var deserializeAws_json1_1CloudTrailAccessNotEnabledExceptionResponse = 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_json1_1CloudTrailAccessNotEnabledException(body, context);
-        contents = __assign({ name: "CloudTrailAccessNotEnabledException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new CloudTrailAccessNotEnabledException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1CloudTrailARNInvalidExceptionResponse = 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_json1_1CloudTrailARNInvalidException(body, context);
-        contents = __assign({ name: "CloudTrailARNInvalidException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new CloudTrailARNInvalidException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1CloudTrailInvalidClientTokenIdExceptionResponse = 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_json1_1CloudTrailInvalidClientTokenIdException(body, context);
-        contents = __assign({ name: "CloudTrailInvalidClientTokenIdException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new CloudTrailInvalidClientTokenIdException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1CloudWatchLogsDeliveryUnavailableExceptionResponse = 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_json1_1CloudWatchLogsDeliveryUnavailableException(body, context);
-        contents = __assign({ name: "CloudWatchLogsDeliveryUnavailableException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new CloudWatchLogsDeliveryUnavailableException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ConflictExceptionResponse = 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_json1_1ConflictException(body, context);
-        contents = __assign({ name: "ConflictException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ConflictException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1EventDataStoreAlreadyExistsExceptionResponse = 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_json1_1EventDataStoreAlreadyExistsException(body, context);
-        contents = __assign({ name: "EventDataStoreAlreadyExistsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new EventDataStoreAlreadyExistsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1EventDataStoreARNInvalidExceptionResponse = 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_json1_1EventDataStoreARNInvalidException(body, context);
-        contents = __assign({ name: "EventDataStoreARNInvalidException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new EventDataStoreARNInvalidException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1EventDataStoreMaxLimitExceededExceptionResponse = 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_json1_1EventDataStoreMaxLimitExceededException(body, context);
-        contents = __assign({ name: "EventDataStoreMaxLimitExceededException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new EventDataStoreMaxLimitExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1EventDataStoreNotFoundExceptionResponse = 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_json1_1EventDataStoreNotFoundException(body, context);
-        contents = __assign({ name: "EventDataStoreNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new EventDataStoreNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1EventDataStoreTerminationProtectedExceptionResponse = 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_json1_1EventDataStoreTerminationProtectedException(body, context);
-        contents = __assign({ name: "EventDataStoreTerminationProtectedException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new EventDataStoreTerminationProtectedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InactiveEventDataStoreExceptionResponse = 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_json1_1InactiveEventDataStoreException(body, context);
-        contents = __assign({ name: "InactiveEventDataStoreException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InactiveEventDataStoreException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InactiveQueryExceptionResponse = 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_json1_1InactiveQueryException(body, context);
-        contents = __assign({ name: "InactiveQueryException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InactiveQueryException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InsightNotEnabledExceptionResponse = 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_json1_1InsightNotEnabledException(body, context);
-        contents = __assign({ name: "InsightNotEnabledException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InsightNotEnabledException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionExceptionResponse = 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_json1_1InsufficientDependencyServiceAccessPermissionException(body, context);
-        contents = __assign({ name: "InsufficientDependencyServiceAccessPermissionException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InsufficientDependencyServiceAccessPermissionException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InsufficientEncryptionPolicyExceptionResponse = 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_json1_1InsufficientEncryptionPolicyException(body, context);
-        contents = __assign({ name: "InsufficientEncryptionPolicyException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InsufficientEncryptionPolicyException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InsufficientS3BucketPolicyExceptionResponse = 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_json1_1InsufficientS3BucketPolicyException(body, context);
-        contents = __assign({ name: "InsufficientS3BucketPolicyException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InsufficientS3BucketPolicyException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InsufficientSnsTopicPolicyExceptionResponse = 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_json1_1InsufficientSnsTopicPolicyException(body, context);
-        contents = __assign({ name: "InsufficientSnsTopicPolicyException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InsufficientSnsTopicPolicyException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidCloudWatchLogsLogGroupArnExceptionResponse = 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_json1_1InvalidCloudWatchLogsLogGroupArnException(body, context);
-        contents = __assign({ name: "InvalidCloudWatchLogsLogGroupArnException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidCloudWatchLogsLogGroupArnException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidCloudWatchLogsRoleArnExceptionResponse = 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_json1_1InvalidCloudWatchLogsRoleArnException(body, context);
-        contents = __assign({ name: "InvalidCloudWatchLogsRoleArnException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidCloudWatchLogsRoleArnException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidDateRangeExceptionResponse = 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_json1_1InvalidDateRangeException(body, context);
-        contents = __assign({ name: "InvalidDateRangeException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidDateRangeException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidEventCategoryExceptionResponse = 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_json1_1InvalidEventCategoryException(body, context);
-        contents = __assign({ name: "InvalidEventCategoryException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidEventCategoryException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidEventDataStoreStatusExceptionResponse = 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_json1_1InvalidEventDataStoreStatusException(body, context);
-        contents = __assign({ name: "InvalidEventDataStoreStatusException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidEventDataStoreStatusException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidEventSelectorsExceptionResponse = 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_json1_1InvalidEventSelectorsException(body, context);
-        contents = __assign({ name: "InvalidEventSelectorsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidEventSelectorsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidHomeRegionExceptionResponse = 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_json1_1InvalidHomeRegionException(body, context);
-        contents = __assign({ name: "InvalidHomeRegionException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidHomeRegionException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidInsightSelectorsExceptionResponse = 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_json1_1InvalidInsightSelectorsException(body, context);
-        contents = __assign({ name: "InvalidInsightSelectorsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidInsightSelectorsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidKmsKeyIdExceptionResponse = 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_json1_1InvalidKmsKeyIdException(body, context);
-        contents = __assign({ name: "InvalidKmsKeyIdException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidKmsKeyIdException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidLookupAttributesExceptionResponse = 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_json1_1InvalidLookupAttributesException(body, context);
-        contents = __assign({ name: "InvalidLookupAttributesException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidLookupAttributesException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidMaxResultsExceptionResponse = 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_json1_1InvalidMaxResultsException(body, context);
-        contents = __assign({ name: "InvalidMaxResultsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidMaxResultsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidNextTokenExceptionResponse = 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_json1_1InvalidNextTokenException(body, context);
-        contents = __assign({ name: "InvalidNextTokenException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidNextTokenException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidParameterCombinationExceptionResponse = 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_json1_1InvalidParameterCombinationException(body, context);
-        contents = __assign({ name: "InvalidParameterCombinationException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidParameterCombinationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidParameterExceptionResponse = 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_json1_1InvalidParameterException(body, 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_json1_1InvalidQueryStatementExceptionResponse = 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_json1_1InvalidQueryStatementException(body, context);
-        contents = __assign({ name: "InvalidQueryStatementException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidQueryStatementException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidQueryStatusExceptionResponse = 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_json1_1InvalidQueryStatusException(body, context);
-        contents = __assign({ name: "InvalidQueryStatusException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidQueryStatusException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidS3BucketNameExceptionResponse = 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_json1_1InvalidS3BucketNameException(body, context);
-        contents = __assign({ name: "InvalidS3BucketNameException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidS3BucketNameException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidS3PrefixExceptionResponse = 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_json1_1InvalidS3PrefixException(body, context);
-        contents = __assign({ name: "InvalidS3PrefixException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidS3PrefixException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidSnsTopicNameExceptionResponse = 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_json1_1InvalidSnsTopicNameException(body, context);
-        contents = __assign({ name: "InvalidSnsTopicNameException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidSnsTopicNameException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidTagParameterExceptionResponse = 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_json1_1InvalidTagParameterException(body, context);
-        contents = __assign({ name: "InvalidTagParameterException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidTagParameterException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidTimeRangeExceptionResponse = 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_json1_1InvalidTimeRangeException(body, context);
-        contents = __assign({ name: "InvalidTimeRangeException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidTimeRangeException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidTokenExceptionResponse = 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_json1_1InvalidTokenException(body, context);
-        contents = __assign({ name: "InvalidTokenException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidTokenException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidTrailNameExceptionResponse = 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_json1_1InvalidTrailNameException(body, context);
-        contents = __assign({ name: "InvalidTrailNameException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidTrailNameException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1KmsExceptionResponse = 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_json1_1KmsException(body, context);
-        contents = __assign({ name: "KmsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KmsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1KmsKeyDisabledExceptionResponse = 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_json1_1KmsKeyDisabledException(body, context);
-        contents = __assign({ name: "KmsKeyDisabledException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KmsKeyDisabledException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1KmsKeyNotFoundExceptionResponse = 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_json1_1KmsKeyNotFoundException(body, context);
-        contents = __assign({ name: "KmsKeyNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KmsKeyNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1MaxConcurrentQueriesExceptionResponse = 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_json1_1MaxConcurrentQueriesException(body, context);
-        contents = __assign({ name: "MaxConcurrentQueriesException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new MaxConcurrentQueriesException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1MaximumNumberOfTrailsExceededExceptionResponse = 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_json1_1MaximumNumberOfTrailsExceededException(body, context);
-        contents = __assign({ name: "MaximumNumberOfTrailsExceededException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new MaximumNumberOfTrailsExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1NotOrganizationMasterAccountExceptionResponse = 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_json1_1NotOrganizationMasterAccountException(body, context);
-        contents = __assign({ name: "NotOrganizationMasterAccountException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new NotOrganizationMasterAccountException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1OperationNotPermittedExceptionResponse = 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_json1_1OperationNotPermittedException(body, context);
-        contents = __assign({ name: "OperationNotPermittedException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new OperationNotPermittedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1OrganizationNotInAllFeaturesModeExceptionResponse = 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_json1_1OrganizationNotInAllFeaturesModeException(body, context);
-        contents = __assign({ name: "OrganizationNotInAllFeaturesModeException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new OrganizationNotInAllFeaturesModeException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1OrganizationsNotInUseExceptionResponse = 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_json1_1OrganizationsNotInUseException(body, context);
-        contents = __assign({ name: "OrganizationsNotInUseException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new OrganizationsNotInUseException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1QueryIdNotFoundExceptionResponse = 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_json1_1QueryIdNotFoundException(body, context);
-        contents = __assign({ name: "QueryIdNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new QueryIdNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ResourceNotFoundExceptionResponse = 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_json1_1ResourceNotFoundException(body, 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_json1_1ResourceTypeNotSupportedExceptionResponse = 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_json1_1ResourceTypeNotSupportedException(body, context);
-        contents = __assign({ name: "ResourceTypeNotSupportedException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ResourceTypeNotSupportedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1S3BucketDoesNotExistExceptionResponse = 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_json1_1S3BucketDoesNotExistException(body, context);
-        contents = __assign({ name: "S3BucketDoesNotExistException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new S3BucketDoesNotExistException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1TagsLimitExceededExceptionResponse = 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_json1_1TagsLimitExceededException(body, context);
-        contents = __assign({ name: "TagsLimitExceededException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TagsLimitExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1TrailAlreadyExistsExceptionResponse = 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_json1_1TrailAlreadyExistsException(body, context);
-        contents = __assign({ name: "TrailAlreadyExistsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TrailAlreadyExistsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1TrailNotFoundExceptionResponse = 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_json1_1TrailNotFoundException(body, context);
-        contents = __assign({ name: "TrailNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TrailNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1TrailNotProvidedExceptionResponse = 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_json1_1TrailNotProvidedException(body, context);
-        contents = __assign({ name: "TrailNotProvidedException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TrailNotProvidedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1UnsupportedOperationExceptionResponse = 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_json1_1UnsupportedOperationException(body, context);
-        contents = __assign({ name: "UnsupportedOperationException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new UnsupportedOperationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var serializeAws_json1_1AddTagsRequest = function (input, context) {
@@ -4617,7 +3533,7 @@ var deserializeAws_json1_1AdvancedEventSelector = function (output, context) {
     };
 };
 var deserializeAws_json1_1AdvancedEventSelectors = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4625,6 +3541,7 @@ var deserializeAws_json1_1AdvancedEventSelectors = function (output, context) {
         }
         return deserializeAws_json1_1AdvancedEventSelector(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1AdvancedFieldSelector = function (output, context) {
     return {
@@ -4650,7 +3567,7 @@ var deserializeAws_json1_1AdvancedFieldSelector = function (output, context) {
     };
 };
 var deserializeAws_json1_1AdvancedFieldSelectors = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4658,6 +3575,7 @@ var deserializeAws_json1_1AdvancedFieldSelectors = function (output, context) {
         }
         return deserializeAws_json1_1AdvancedFieldSelector(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1CancelQueryResponse = function (output, context) {
     return {
@@ -4739,7 +3657,7 @@ var deserializeAws_json1_1DataResource = function (output, context) {
     };
 };
 var deserializeAws_json1_1DataResources = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4747,9 +3665,10 @@ var deserializeAws_json1_1DataResources = function (output, context) {
         }
         return deserializeAws_json1_1DataResource(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1DataResourceValues = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4757,6 +3676,7 @@ var deserializeAws_json1_1DataResourceValues = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1DeleteEventDataStoreResponse = function (output, context) {
     return {};
@@ -4840,7 +3760,7 @@ var deserializeAws_json1_1EventDataStoreNotFoundException = function (output, co
     };
 };
 var deserializeAws_json1_1EventDataStores = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4848,6 +3768,7 @@ var deserializeAws_json1_1EventDataStores = function (output, context) {
         }
         return deserializeAws_json1_1EventDataStore(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1EventDataStoreTerminationProtectedException = function (output, context) {
     return {
@@ -4867,7 +3788,7 @@ var deserializeAws_json1_1EventSelector = function (output, context) {
     };
 };
 var deserializeAws_json1_1EventSelectors = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4875,9 +3796,10 @@ var deserializeAws_json1_1EventSelectors = function (output, context) {
         }
         return deserializeAws_json1_1EventSelector(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1EventsList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4885,9 +3807,10 @@ var deserializeAws_json1_1EventsList = function (output, context) {
         }
         return deserializeAws_json1_1Event(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ExcludeManagementEventSources = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4895,6 +3818,7 @@ var deserializeAws_json1_1ExcludeManagementEventSources = function (output, cont
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1GetEventDataStoreResponse = function (output, context) {
     return {
@@ -5009,7 +3933,7 @@ var deserializeAws_json1_1InsightSelector = function (output, context) {
     };
 };
 var deserializeAws_json1_1InsightSelectors = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5017,6 +3941,7 @@ var deserializeAws_json1_1InsightSelectors = function (output, context) {
         }
         return deserializeAws_json1_1InsightSelector(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1InsufficientDependencyServiceAccessPermissionException = function (output, context) {
     return {
@@ -5237,7 +4162,7 @@ var deserializeAws_json1_1OperationNotPermittedException = function (output, con
     };
 };
 var deserializeAws_json1_1Operator = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5245,6 +4170,7 @@ var deserializeAws_json1_1Operator = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1OrganizationNotInAllFeaturesModeException = function (output, context) {
     return {
@@ -5269,7 +4195,7 @@ var deserializeAws_json1_1PublicKey = function (output, context) {
     };
 };
 var deserializeAws_json1_1PublicKeyList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5277,6 +4203,7 @@ var deserializeAws_json1_1PublicKeyList = function (output, context) {
         }
         return deserializeAws_json1_1PublicKey(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1PutEventSelectorsResponse = function (output, context) {
     return {
@@ -5298,7 +4225,7 @@ var deserializeAws_json1_1PutInsightSelectorsResponse = function (output, contex
     };
 };
 var deserializeAws_json1_1Queries = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5306,6 +4233,7 @@ var deserializeAws_json1_1Queries = function (output, context) {
         }
         return deserializeAws_json1_1Query(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1Query = function (output, context) {
     return {
@@ -5332,7 +4260,7 @@ var deserializeAws_json1_1QueryResultColumn = function (output, context) {
     }, {});
 };
 var deserializeAws_json1_1QueryResultRow = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5340,9 +4268,10 @@ var deserializeAws_json1_1QueryResultRow = function (output, context) {
         }
         return deserializeAws_json1_1QueryResultColumn(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1QueryResultRows = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5350,6 +4279,7 @@ var deserializeAws_json1_1QueryResultRows = function (output, context) {
         }
         return deserializeAws_json1_1QueryResultRow(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1QueryStatistics = function (output, context) {
     return {
@@ -5377,7 +4307,7 @@ var deserializeAws_json1_1Resource = function (output, context) {
     };
 };
 var deserializeAws_json1_1ResourceList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5385,6 +4315,7 @@ var deserializeAws_json1_1ResourceList = function (output, context) {
         }
         return deserializeAws_json1_1Resource(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ResourceNotFoundException = function (output, context) {
     return {
@@ -5400,7 +4331,7 @@ var deserializeAws_json1_1ResourceTag = function (output, context) {
     };
 };
 var deserializeAws_json1_1ResourceTagList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5408,6 +4339,7 @@ var deserializeAws_json1_1ResourceTagList = function (output, context) {
         }
         return deserializeAws_json1_1ResourceTag(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ResourceTypeNotSupportedException = function (output, context) {
     return {
@@ -5462,7 +4394,7 @@ var deserializeAws_json1_1TagsLimitExceededException = function (output, context
     };
 };
 var deserializeAws_json1_1TagsList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5470,6 +4402,7 @@ var deserializeAws_json1_1TagsList = function (output, context) {
         }
         return deserializeAws_json1_1Tag(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1Trail = function (output, context) {
     return {
@@ -5504,7 +4437,7 @@ var deserializeAws_json1_1TrailInfo = function (output, context) {
     };
 };
 var deserializeAws_json1_1TrailList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5512,6 +4445,7 @@ var deserializeAws_json1_1TrailList = function (output, context) {
         }
         return deserializeAws_json1_1Trail(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1TrailNotFoundException = function (output, context) {
     return {
@@ -5524,7 +4458,7 @@ var deserializeAws_json1_1TrailNotProvidedException = function (output, context)
     };
 };
 var deserializeAws_json1_1Trails = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5532,6 +4466,7 @@ var deserializeAws_json1_1Trails = function (output, context) {
         }
         return deserializeAws_json1_1TrailInfo(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1UnsupportedOperationException = function (output, context) {
     return {