@aws-sdk/client-database-migration-service 3.50.0 → 3.53.0

package/dist-es/protocols/Aws_json1_1.js

@@ -1,6 +1,8 @@
 import { __assign, __awaiter, __generator } 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 { DatabaseMigrationServiceServiceException as __BaseException } from "../models/DatabaseMigrationServiceServiceException";
+import { AccessDeniedFault, InsufficientResourceCapacityFault, InvalidCertificateFault, InvalidResourceStateFault, InvalidSubnet, KMSAccessDeniedFault, KMSDisabledFault, KMSFault, KMSInvalidStateFault, KMSKeyNotAccessibleFault, KMSNotFoundFault, KMSThrottlingFault, ReplicationSubnetGroupDoesNotCoverEnoughAZs, ResourceAlreadyExistsFault, ResourceNotFoundFault, ResourceQuotaExceededFault, S3AccessDeniedFault, S3ResourceNotFoundFault, SNSInvalidTopicFault, SNSNoAuthorizationFault, StorageQuotaExceededFault, SubnetAlreadyInUse, UpgradeDependencyFailureFault, } from "../models/models_0";
 export var serializeAws_json1_1AddTagsToResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
     var headers, body;
     return __generator(this, function (_a) {
@@ -625,16 +627,16 @@ export var deserializeAws_json1_1AddTagsToResourceCommand = function (output, co
     });
 }); };
 var deserializeAws_json1_1AddTagsToResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -643,22 +645,16 @@ var deserializeAws_json1_1AddTagsToResourceCommandError = function (output, cont
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -681,16 +677,16 @@ export var deserializeAws_json1_1ApplyPendingMaintenanceActionCommand = function
     });
 }); };
 var deserializeAws_json1_1ApplyPendingMaintenanceActionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -699,22 +695,16 @@ var deserializeAws_json1_1ApplyPendingMaintenanceActionCommandError = function (
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -737,16 +727,16 @@ export var deserializeAws_json1_1CancelReplicationTaskAssessmentRunCommand = fun
     });
 }); };
 var deserializeAws_json1_1CancelReplicationTaskAssessmentRunCommandError = 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;
@@ -759,34 +749,20 @@ var deserializeAws_json1_1CancelReplicationTaskAssessmentRunCommandError = funct
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(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_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -809,16 +785,16 @@ export var deserializeAws_json1_1CreateEndpointCommand = function (output, conte
     });
 }); };
 var deserializeAws_json1_1CreateEndpointCommandError = 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;
@@ -839,58 +815,28 @@ var deserializeAws_json1_1CreateEndpointCommandError = function (output, context
                     case "com.amazonaws.databasemigrationservice#S3AccessDeniedFault": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(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_1InvalidResourceStateFaultResponse(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_1KMSKeyNotAccessibleFaultResponse(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_1ResourceAlreadyExistsFaultResponse(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_1ResourceNotFoundFaultResponse(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_1ResourceQuotaExceededFaultResponse(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_1S3AccessDeniedFaultResponse(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_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1KMSKeyNotAccessibleFaultResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ResourceAlreadyExistsFaultResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1S3AccessDeniedFaultResponse(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);
         }
     });
 }); };
@@ -913,16 +859,16 @@ export var deserializeAws_json1_1CreateEventSubscriptionCommand = function (outp
     });
 }); };
 var deserializeAws_json1_1CreateEventSubscriptionCommandError = 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;
@@ -949,76 +895,34 @@ var deserializeAws_json1_1CreateEventSubscriptionCommandError = function (output
                     case "com.amazonaws.databasemigrationservice#SNSNoAuthorizationFault": return [3, 20];
                 }
                 return [3, 22];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1KMSAccessDeniedFaultResponse(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_1KMSDisabledFaultResponse(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_1KMSInvalidStateFaultResponse(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_1KMSNotFoundFaultResponse(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_1KMSThrottlingFaultResponse(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_1ResourceAlreadyExistsFaultResponse(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_1ResourceNotFoundFaultResponse(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_1ResourceQuotaExceededFaultResponse(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_1SNSInvalidTopicFaultResponse(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_1SNSNoAuthorizationFaultResponse(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_1KMSAccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1KMSDisabledFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1KMSInvalidStateFaultResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1KMSNotFoundFaultResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1KMSThrottlingFaultResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1ResourceAlreadyExistsFaultResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1SNSInvalidTopicFaultResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1SNSNoAuthorizationFaultResponse(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);
         }
     });
 }); };
@@ -1041,16 +945,16 @@ export var deserializeAws_json1_1CreateReplicationInstanceCommand = function (ou
     });
 }); };
 var deserializeAws_json1_1CreateReplicationInstanceCommandError = 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;
@@ -1077,76 +981,34 @@ var deserializeAws_json1_1CreateReplicationInstanceCommandError = function (outp
                     case "com.amazonaws.databasemigrationservice#StorageQuotaExceededFault": return [3, 20];
                 }
                 return [3, 22];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(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_1InsufficientResourceCapacityFaultResponse(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_1InvalidResourceStateFaultResponse(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_1InvalidSubnetResponse(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_1KMSKeyNotAccessibleFaultResponse(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_1ReplicationSubnetGroupDoesNotCoverEnoughAZsResponse(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_1ResourceAlreadyExistsFaultResponse(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_1ResourceNotFoundFaultResponse(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_1ResourceQuotaExceededFaultResponse(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_1StorageQuotaExceededFaultResponse(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_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InsufficientResourceCapacityFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1InvalidSubnetResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1KMSKeyNotAccessibleFaultResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1ReplicationSubnetGroupDoesNotCoverEnoughAZsResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1ResourceAlreadyExistsFaultResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1StorageQuotaExceededFaultResponse(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);
         }
     });
 }); };
@@ -1169,16 +1031,16 @@ export var deserializeAws_json1_1CreateReplicationSubnetGroupCommand = function
     });
 }); };
 var deserializeAws_json1_1CreateReplicationSubnetGroupCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1197,52 +1059,26 @@ var deserializeAws_json1_1CreateReplicationSubnetGroupCommandError = function (o
                     case "com.amazonaws.databasemigrationservice#ResourceQuotaExceededFault": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidSubnetResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ReplicationSubnetGroupDoesNotCoverEnoughAZsResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ResourceAlreadyExistsFaultResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_json1_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidSubnetResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ReplicationSubnetGroupDoesNotCoverEnoughAZsResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ResourceAlreadyExistsFaultResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 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) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1265,16 +1101,16 @@ export var deserializeAws_json1_1CreateReplicationTaskCommand = function (output
     });
 }); };
 var deserializeAws_json1_1CreateReplicationTaskCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1293,52 +1129,26 @@ var deserializeAws_json1_1CreateReplicationTaskCommandError = function (output,
                     case "com.amazonaws.databasemigrationservice#ResourceQuotaExceededFault": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1KMSKeyNotAccessibleFaultResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ResourceAlreadyExistsFaultResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_json1_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1KMSKeyNotAccessibleFaultResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ResourceAlreadyExistsFaultResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 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) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1361,16 +1171,16 @@ export var deserializeAws_json1_1DeleteCertificateCommand = function (output, co
     });
 }); };
 var deserializeAws_json1_1DeleteCertificateCommandError = 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;
@@ -1381,28 +1191,18 @@ var deserializeAws_json1_1DeleteCertificateCommandError = function (output, cont
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -1425,16 +1225,16 @@ export var deserializeAws_json1_1DeleteConnectionCommand = function (output, con
     });
 }); };
 var deserializeAws_json1_1DeleteConnectionCommandError = 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;
@@ -1447,34 +1247,20 @@ var deserializeAws_json1_1DeleteConnectionCommandError = function (output, conte
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(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_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -1497,16 +1283,16 @@ export var deserializeAws_json1_1DeleteEndpointCommand = function (output, conte
     });
 }); };
 var deserializeAws_json1_1DeleteEndpointCommandError = 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;
@@ -1517,28 +1303,18 @@ var deserializeAws_json1_1DeleteEndpointCommandError = function (output, context
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -1561,16 +1337,16 @@ export var deserializeAws_json1_1DeleteEventSubscriptionCommand = function (outp
     });
 }); };
 var deserializeAws_json1_1DeleteEventSubscriptionCommandError = 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;
@@ -1581,28 +1357,18 @@ var deserializeAws_json1_1DeleteEventSubscriptionCommandError = function (output
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -1625,16 +1391,16 @@ export var deserializeAws_json1_1DeleteReplicationInstanceCommand = function (ou
     });
 }); };
 var deserializeAws_json1_1DeleteReplicationInstanceCommandError = 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;
@@ -1645,28 +1411,18 @@ var deserializeAws_json1_1DeleteReplicationInstanceCommandError = function (outp
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -1689,16 +1445,16 @@ export var deserializeAws_json1_1DeleteReplicationSubnetGroupCommand = function
     });
 }); };
 var deserializeAws_json1_1DeleteReplicationSubnetGroupCommandError = 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;
@@ -1709,28 +1465,18 @@ var deserializeAws_json1_1DeleteReplicationSubnetGroupCommandError = function (o
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -1753,16 +1499,16 @@ export var deserializeAws_json1_1DeleteReplicationTaskCommand = function (output
     });
 }); };
 var deserializeAws_json1_1DeleteReplicationTaskCommandError = 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;
@@ -1773,28 +1519,18 @@ var deserializeAws_json1_1DeleteReplicationTaskCommandError = function (output,
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -1817,16 +1553,16 @@ export var deserializeAws_json1_1DeleteReplicationTaskAssessmentRunCommand = fun
     });
 }); };
 var deserializeAws_json1_1DeleteReplicationTaskAssessmentRunCommandError = 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;
@@ -1839,34 +1575,20 @@ var deserializeAws_json1_1DeleteReplicationTaskAssessmentRunCommandError = funct
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(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_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -1889,7 +1611,7 @@ export var deserializeAws_json1_1DescribeAccountAttributesCommand = function (ou
     });
 }); };
 var deserializeAws_json1_1DescribeAccountAttributesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -1904,13 +1626,14 @@ var deserializeAws_json1_1DescribeAccountAttributesCommandError = function (outp
                 switch (errorCode) {
                     default:
                         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) });
+                        response = new __BaseException({
+                            name: parsedBody.code || parsedBody.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -1933,16 +1656,16 @@ export var deserializeAws_json1_1DescribeApplicableIndividualAssessmentsCommand
     });
 }); };
 var deserializeAws_json1_1DescribeApplicableIndividualAssessmentsCommandError = 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;
@@ -1955,34 +1678,20 @@ var deserializeAws_json1_1DescribeApplicableIndividualAssessmentsCommandError =
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(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_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -2005,16 +1714,16 @@ export var deserializeAws_json1_1DescribeCertificatesCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1DescribeCertificatesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2023,22 +1732,16 @@ var deserializeAws_json1_1DescribeCertificatesCommandError = function (output, c
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2061,16 +1764,16 @@ export var deserializeAws_json1_1DescribeConnectionsCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1DescribeConnectionsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2079,22 +1782,16 @@ var deserializeAws_json1_1DescribeConnectionsCommandError = function (output, co
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2117,16 +1814,16 @@ export var deserializeAws_json1_1DescribeEndpointsCommand = function (output, co
     });
 }); };
 var deserializeAws_json1_1DescribeEndpointsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2135,22 +1832,16 @@ var deserializeAws_json1_1DescribeEndpointsCommandError = function (output, cont
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2173,7 +1864,7 @@ export var deserializeAws_json1_1DescribeEndpointSettingsCommand = function (out
     });
 }); };
 var deserializeAws_json1_1DescribeEndpointSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -2188,13 +1879,14 @@ var deserializeAws_json1_1DescribeEndpointSettingsCommandError = function (outpu
                 switch (errorCode) {
                     default:
                         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) });
+                        response = new __BaseException({
+                            name: parsedBody.code || parsedBody.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2217,7 +1909,7 @@ export var deserializeAws_json1_1DescribeEndpointTypesCommand = function (output
     });
 }); };
 var deserializeAws_json1_1DescribeEndpointTypesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -2232,13 +1924,14 @@ var deserializeAws_json1_1DescribeEndpointTypesCommandError = function (output,
                 switch (errorCode) {
                     default:
                         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) });
+                        response = new __BaseException({
+                            name: parsedBody.code || parsedBody.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2261,7 +1954,7 @@ export var deserializeAws_json1_1DescribeEventCategoriesCommand = function (outp
     });
 }); };
 var deserializeAws_json1_1DescribeEventCategoriesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -2276,13 +1969,14 @@ var deserializeAws_json1_1DescribeEventCategoriesCommandError = function (output
                 switch (errorCode) {
                     default:
                         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) });
+                        response = new __BaseException({
+                            name: parsedBody.code || parsedBody.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2305,7 +1999,7 @@ export var deserializeAws_json1_1DescribeEventsCommand = function (output, conte
     });
 }); };
 var deserializeAws_json1_1DescribeEventsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -2320,13 +2014,14 @@ var deserializeAws_json1_1DescribeEventsCommandError = function (output, context
                 switch (errorCode) {
                     default:
                         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) });
+                        response = new __BaseException({
+                            name: parsedBody.code || parsedBody.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2349,16 +2044,16 @@ export var deserializeAws_json1_1DescribeEventSubscriptionsCommand = function (o
     });
 }); };
 var deserializeAws_json1_1DescribeEventSubscriptionsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2367,22 +2062,16 @@ var deserializeAws_json1_1DescribeEventSubscriptionsCommandError = function (out
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2405,7 +2094,7 @@ export var deserializeAws_json1_1DescribeOrderableReplicationInstancesCommand =
     });
 }); };
 var deserializeAws_json1_1DescribeOrderableReplicationInstancesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var parsedOutput, _a, response, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -2420,13 +2109,14 @@ var deserializeAws_json1_1DescribeOrderableReplicationInstancesCommandError = fu
                 switch (errorCode) {
                     default:
                         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) });
+                        response = new __BaseException({
+                            name: parsedBody.code || parsedBody.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2449,16 +2139,16 @@ export var deserializeAws_json1_1DescribePendingMaintenanceActionsCommand = func
     });
 }); };
 var deserializeAws_json1_1DescribePendingMaintenanceActionsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2467,22 +2157,16 @@ var deserializeAws_json1_1DescribePendingMaintenanceActionsCommandError = functi
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2505,16 +2189,16 @@ export var deserializeAws_json1_1DescribeRefreshSchemasStatusCommand = function
     });
 }); };
 var deserializeAws_json1_1DescribeRefreshSchemasStatusCommandError = 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;
@@ -2525,28 +2209,18 @@ var deserializeAws_json1_1DescribeRefreshSchemasStatusCommandError = function (o
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -2569,16 +2243,16 @@ export var deserializeAws_json1_1DescribeReplicationInstancesCommand = function
     });
 }); };
 var deserializeAws_json1_1DescribeReplicationInstancesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2587,22 +2261,16 @@ var deserializeAws_json1_1DescribeReplicationInstancesCommandError = function (o
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2625,16 +2293,16 @@ export var deserializeAws_json1_1DescribeReplicationInstanceTaskLogsCommand = fu
     });
 }); };
 var deserializeAws_json1_1DescribeReplicationInstanceTaskLogsCommandError = 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;
@@ -2645,28 +2313,18 @@ var deserializeAws_json1_1DescribeReplicationInstanceTaskLogsCommandError = func
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -2689,16 +2347,16 @@ export var deserializeAws_json1_1DescribeReplicationSubnetGroupsCommand = functi
     });
 }); };
 var deserializeAws_json1_1DescribeReplicationSubnetGroupsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2707,22 +2365,16 @@ var deserializeAws_json1_1DescribeReplicationSubnetGroupsCommandError = function
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2745,16 +2397,16 @@ export var deserializeAws_json1_1DescribeReplicationTaskAssessmentResultsCommand
     });
 }); };
 var deserializeAws_json1_1DescribeReplicationTaskAssessmentResultsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2763,22 +2415,16 @@ var deserializeAws_json1_1DescribeReplicationTaskAssessmentResultsCommandError =
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2801,16 +2447,16 @@ export var deserializeAws_json1_1DescribeReplicationTaskAssessmentRunsCommand =
     });
 }); };
 var deserializeAws_json1_1DescribeReplicationTaskAssessmentRunsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2819,22 +2465,16 @@ var deserializeAws_json1_1DescribeReplicationTaskAssessmentRunsCommandError = fu
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2857,16 +2497,16 @@ export var deserializeAws_json1_1DescribeReplicationTaskIndividualAssessmentsCom
     });
 }); };
 var deserializeAws_json1_1DescribeReplicationTaskIndividualAssessmentsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2875,22 +2515,16 @@ var deserializeAws_json1_1DescribeReplicationTaskIndividualAssessmentsCommandErr
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2913,16 +2547,16 @@ export var deserializeAws_json1_1DescribeReplicationTasksCommand = function (out
     });
 }); };
 var deserializeAws_json1_1DescribeReplicationTasksCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2931,22 +2565,16 @@ var deserializeAws_json1_1DescribeReplicationTasksCommandError = function (outpu
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2969,16 +2597,16 @@ export var deserializeAws_json1_1DescribeSchemasCommand = function (output, cont
     });
 }); };
 var deserializeAws_json1_1DescribeSchemasCommandError = 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;
@@ -2989,28 +2617,18 @@ var deserializeAws_json1_1DescribeSchemasCommandError = function (output, contex
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -3033,16 +2651,16 @@ export var deserializeAws_json1_1DescribeTableStatisticsCommand = function (outp
     });
 }); };
 var deserializeAws_json1_1DescribeTableStatisticsCommandError = 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;
@@ -3053,28 +2671,18 @@ var deserializeAws_json1_1DescribeTableStatisticsCommandError = function (output
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -3097,16 +2705,16 @@ export var deserializeAws_json1_1ImportCertificateCommand = function (output, co
     });
 }); };
 var deserializeAws_json1_1ImportCertificateCommandError = 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;
@@ -3119,34 +2727,20 @@ var deserializeAws_json1_1ImportCertificateCommandError = function (output, cont
                     case "com.amazonaws.databasemigrationservice#ResourceQuotaExceededFault": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidCertificateFaultResponse(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_1ResourceAlreadyExistsFaultResponse(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_1ResourceQuotaExceededFaultResponse(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_1InvalidCertificateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceAlreadyExistsFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(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);
         }
     });
 }); };
@@ -3169,16 +2763,16 @@ export var deserializeAws_json1_1ListTagsForResourceCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1ListTagsForResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3187,22 +2781,16 @@ var deserializeAws_json1_1ListTagsForResourceCommandError = function (output, co
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3225,16 +2813,16 @@ export var deserializeAws_json1_1ModifyEndpointCommand = function (output, conte
     });
 }); };
 var deserializeAws_json1_1ModifyEndpointCommandError = 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;
@@ -3251,46 +2839,24 @@ var deserializeAws_json1_1ModifyEndpointCommandError = function (output, context
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(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_1InvalidResourceStateFaultResponse(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_1KMSKeyNotAccessibleFaultResponse(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_1ResourceAlreadyExistsFaultResponse(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_1ResourceNotFoundFaultResponse(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_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1KMSKeyNotAccessibleFaultResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ResourceAlreadyExistsFaultResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -3313,16 +2879,16 @@ export var deserializeAws_json1_1ModifyEventSubscriptionCommand = function (outp
     });
 }); };
 var deserializeAws_json1_1ModifyEventSubscriptionCommandError = 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;
@@ -3347,70 +2913,32 @@ var deserializeAws_json1_1ModifyEventSubscriptionCommandError = function (output
                     case "com.amazonaws.databasemigrationservice#SNSNoAuthorizationFault": return [3, 18];
                 }
                 return [3, 20];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1KMSAccessDeniedFaultResponse(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_1KMSDisabledFaultResponse(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_1KMSInvalidStateFaultResponse(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_1KMSNotFoundFaultResponse(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_1KMSThrottlingFaultResponse(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_1ResourceNotFoundFaultResponse(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_1ResourceQuotaExceededFaultResponse(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_1SNSInvalidTopicFaultResponse(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_1SNSNoAuthorizationFaultResponse(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_1KMSAccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1KMSDisabledFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1KMSInvalidStateFaultResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1KMSNotFoundFaultResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1KMSThrottlingFaultResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1SNSInvalidTopicFaultResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1SNSNoAuthorizationFaultResponse(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);
         }
     });
 }); };
@@ -3433,16 +2961,16 @@ export var deserializeAws_json1_1ModifyReplicationInstanceCommand = function (ou
     });
 }); };
 var deserializeAws_json1_1ModifyReplicationInstanceCommandError = 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;
@@ -3463,58 +2991,28 @@ var deserializeAws_json1_1ModifyReplicationInstanceCommandError = function (outp
                     case "com.amazonaws.databasemigrationservice#UpgradeDependencyFailureFault": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(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_1InsufficientResourceCapacityFaultResponse(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_1InvalidResourceStateFaultResponse(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_1ResourceAlreadyExistsFaultResponse(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_1ResourceNotFoundFaultResponse(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_1StorageQuotaExceededFaultResponse(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_1UpgradeDependencyFailureFaultResponse(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_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InsufficientResourceCapacityFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ResourceAlreadyExistsFaultResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1StorageQuotaExceededFaultResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1UpgradeDependencyFailureFaultResponse(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);
         }
     });
 }); };
@@ -3537,16 +3035,16 @@ export var deserializeAws_json1_1ModifyReplicationSubnetGroupCommand = function
     });
 }); };
 var deserializeAws_json1_1ModifyReplicationSubnetGroupCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3565,52 +3063,26 @@ var deserializeAws_json1_1ModifyReplicationSubnetGroupCommandError = function (o
                     case "com.amazonaws.databasemigrationservice#SubnetAlreadyInUse": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_json1_1InvalidSubnetResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_json1_1ReplicationSubnetGroupDoesNotCoverEnoughAZsResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_json1_1SubnetAlreadyInUseResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_json1_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidSubnetResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ReplicationSubnetGroupDoesNotCoverEnoughAZsResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1SubnetAlreadyInUseResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 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) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3633,16 +3105,16 @@ export var deserializeAws_json1_1ModifyReplicationTaskCommand = function (output
     });
 }); };
 var deserializeAws_json1_1ModifyReplicationTaskCommandError = 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;
@@ -3657,40 +3129,22 @@ var deserializeAws_json1_1ModifyReplicationTaskCommandError = function (output,
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1KMSKeyNotAccessibleFaultResponse(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_1ResourceAlreadyExistsFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1KMSKeyNotAccessibleFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ResourceAlreadyExistsFaultResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -3713,16 +3167,16 @@ export var deserializeAws_json1_1MoveReplicationTaskCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1MoveReplicationTaskCommandError = 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;
@@ -3739,46 +3193,24 @@ var deserializeAws_json1_1MoveReplicationTaskCommandError = function (output, co
                     case "com.amazonaws.databasemigrationservice#ResourceQuotaExceededFault": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(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_1InvalidResourceStateFaultResponse(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_1KMSKeyNotAccessibleFaultResponse(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_1ResourceNotFoundFaultResponse(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_1ResourceQuotaExceededFaultResponse(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_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1KMSKeyNotAccessibleFaultResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(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);
         }
     });
 }); };
@@ -3801,16 +3233,16 @@ export var deserializeAws_json1_1RebootReplicationInstanceCommand = function (ou
     });
 }); };
 var deserializeAws_json1_1RebootReplicationInstanceCommandError = 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;
@@ -3821,28 +3253,18 @@ var deserializeAws_json1_1RebootReplicationInstanceCommandError = function (outp
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -3865,16 +3287,16 @@ export var deserializeAws_json1_1RefreshSchemasCommand = function (output, conte
     });
 }); };
 var deserializeAws_json1_1RefreshSchemasCommandError = 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;
@@ -3889,40 +3311,22 @@ var deserializeAws_json1_1RefreshSchemasCommandError = function (output, context
                     case "com.amazonaws.databasemigrationservice#ResourceQuotaExceededFault": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1KMSKeyNotAccessibleFaultResponse(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_1ResourceNotFoundFaultResponse(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_1ResourceQuotaExceededFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1KMSKeyNotAccessibleFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(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);
         }
     });
 }); };
@@ -3945,16 +3349,16 @@ export var deserializeAws_json1_1ReloadTablesCommand = function (output, context
     });
 }); };
 var deserializeAws_json1_1ReloadTablesCommandError = 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;
@@ -3965,28 +3369,18 @@ var deserializeAws_json1_1ReloadTablesCommandError = function (output, context)
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -4009,16 +3403,16 @@ export var deserializeAws_json1_1RemoveTagsFromResourceCommand = function (outpu
     });
 }); };
 var deserializeAws_json1_1RemoveTagsFromResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4027,22 +3421,16 @@ var deserializeAws_json1_1RemoveTagsFromResourceCommandError = function (output,
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 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) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -4065,16 +3453,16 @@ export var deserializeAws_json1_1StartReplicationTaskCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1StartReplicationTaskCommandError = 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;
@@ -4087,34 +3475,20 @@ var deserializeAws_json1_1StartReplicationTaskCommandError = function (output, c
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(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_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -4137,16 +3511,16 @@ export var deserializeAws_json1_1StartReplicationTaskAssessmentCommand = functio
     });
 }); };
 var deserializeAws_json1_1StartReplicationTaskAssessmentCommandError = 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;
@@ -4157,28 +3531,18 @@ var deserializeAws_json1_1StartReplicationTaskAssessmentCommandError = function
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -4201,16 +3565,16 @@ export var deserializeAws_json1_1StartReplicationTaskAssessmentRunCommand = func
     });
 }); };
 var deserializeAws_json1_1StartReplicationTaskAssessmentRunCommandError = 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;
@@ -4241,88 +3605,38 @@ var deserializeAws_json1_1StartReplicationTaskAssessmentRunCommandError = functi
                     case "com.amazonaws.databasemigrationservice#S3ResourceNotFoundFault": return [3, 24];
                 }
                 return [3, 26];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(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_1InvalidResourceStateFaultResponse(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_1KMSAccessDeniedFaultResponse(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_1KMSDisabledFaultResponse(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_1KMSFaultResponse(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_1KMSInvalidStateFaultResponse(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_1KMSKeyNotAccessibleFaultResponse(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_1KMSNotFoundFaultResponse(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_1ResourceAlreadyExistsFaultResponse(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_1ResourceNotFoundFaultResponse(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_1S3AccessDeniedFaultResponse(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_1S3ResourceNotFoundFaultResponse(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_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1KMSAccessDeniedFaultResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1KMSDisabledFaultResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1KMSFaultResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_json1_1KMSInvalidStateFaultResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_json1_1KMSKeyNotAccessibleFaultResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_json1_1KMSNotFoundFaultResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_json1_1ResourceAlreadyExistsFaultResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
+            case 22: return [4, deserializeAws_json1_1S3AccessDeniedFaultResponse(parsedOutput, context)];
+            case 23: throw _d.sent();
+            case 24: return [4, deserializeAws_json1_1S3ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -4345,16 +3659,16 @@ export var deserializeAws_json1_1StopReplicationTaskCommand = function (output,
     });
 }); };
 var deserializeAws_json1_1StopReplicationTaskCommandError = 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;
@@ -4365,28 +3679,18 @@ var deserializeAws_json1_1StopReplicationTaskCommandError = function (output, co
                     case "com.amazonaws.databasemigrationservice#ResourceNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(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_1ResourceNotFoundFaultResponse(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_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(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);
         }
     });
 }); };
@@ -4409,16 +3713,16 @@ export var deserializeAws_json1_1TestConnectionCommand = function (output, conte
     });
 }); };
 var deserializeAws_json1_1TestConnectionCommandError = 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;
@@ -4435,254 +3739,232 @@ var deserializeAws_json1_1TestConnectionCommandError = function (output, context
                     case "com.amazonaws.databasemigrationservice#ResourceQuotaExceededFault": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_json1_1AccessDeniedFaultResponse(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_1InvalidResourceStateFaultResponse(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_1KMSKeyNotAccessibleFaultResponse(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_1ResourceNotFoundFaultResponse(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_1ResourceQuotaExceededFaultResponse(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_1AccessDeniedFaultResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_json1_1InvalidResourceStateFaultResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_json1_1KMSKeyNotAccessibleFaultResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_json1_1ResourceNotFoundFaultResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_json1_1ResourceQuotaExceededFaultResponse(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);
         }
     });
 }); };
 var deserializeAws_json1_1AccessDeniedFaultResponse = 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_1AccessDeniedFault(body, context);
-        contents = __assign({ name: "AccessDeniedFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new AccessDeniedFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InsufficientResourceCapacityFaultResponse = 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_1InsufficientResourceCapacityFault(body, context);
-        contents = __assign({ name: "InsufficientResourceCapacityFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InsufficientResourceCapacityFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidCertificateFaultResponse = 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_1InvalidCertificateFault(body, context);
-        contents = __assign({ name: "InvalidCertificateFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidCertificateFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidResourceStateFaultResponse = 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_1InvalidResourceStateFault(body, context);
-        contents = __assign({ name: "InvalidResourceStateFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidResourceStateFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1InvalidSubnetResponse = 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_1InvalidSubnet(body, context);
-        contents = __assign({ name: "InvalidSubnet", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidSubnet(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1KMSAccessDeniedFaultResponse = 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_1KMSAccessDeniedFault(body, context);
-        contents = __assign({ name: "KMSAccessDeniedFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSAccessDeniedFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1KMSDisabledFaultResponse = 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_1KMSDisabledFault(body, context);
-        contents = __assign({ name: "KMSDisabledFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSDisabledFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1KMSFaultResponse = 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_1KMSFault(body, context);
-        contents = __assign({ name: "KMSFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1KMSInvalidStateFaultResponse = 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_1KMSInvalidStateFault(body, context);
-        contents = __assign({ name: "KMSInvalidStateFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSInvalidStateFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1KMSKeyNotAccessibleFaultResponse = 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_1KMSKeyNotAccessibleFault(body, context);
-        contents = __assign({ name: "KMSKeyNotAccessibleFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSKeyNotAccessibleFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1KMSNotFoundFaultResponse = 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_1KMSNotFoundFault(body, context);
-        contents = __assign({ name: "KMSNotFoundFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSNotFoundFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1KMSThrottlingFaultResponse = 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_1KMSThrottlingFault(body, context);
-        contents = __assign({ name: "KMSThrottlingFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new KMSThrottlingFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ReplicationSubnetGroupDoesNotCoverEnoughAZsResponse = 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_1ReplicationSubnetGroupDoesNotCoverEnoughAZs(body, context);
-        contents = __assign({ name: "ReplicationSubnetGroupDoesNotCoverEnoughAZs", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ReplicationSubnetGroupDoesNotCoverEnoughAZs(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ResourceAlreadyExistsFaultResponse = 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_1ResourceAlreadyExistsFault(body, context);
-        contents = __assign({ name: "ResourceAlreadyExistsFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ResourceAlreadyExistsFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ResourceNotFoundFaultResponse = 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_1ResourceNotFoundFault(body, context);
-        contents = __assign({ name: "ResourceNotFoundFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ResourceNotFoundFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1ResourceQuotaExceededFaultResponse = 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_1ResourceQuotaExceededFault(body, context);
-        contents = __assign({ name: "ResourceQuotaExceededFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ResourceQuotaExceededFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1S3AccessDeniedFaultResponse = 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_1S3AccessDeniedFault(body, context);
-        contents = __assign({ name: "S3AccessDeniedFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new S3AccessDeniedFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1S3ResourceNotFoundFaultResponse = 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_1S3ResourceNotFoundFault(body, context);
-        contents = __assign({ name: "S3ResourceNotFoundFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new S3ResourceNotFoundFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1SNSInvalidTopicFaultResponse = 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_1SNSInvalidTopicFault(body, context);
-        contents = __assign({ name: "SNSInvalidTopicFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new SNSInvalidTopicFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1SNSNoAuthorizationFaultResponse = 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_1SNSNoAuthorizationFault(body, context);
-        contents = __assign({ name: "SNSNoAuthorizationFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new SNSNoAuthorizationFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1StorageQuotaExceededFaultResponse = 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_1StorageQuotaExceededFault(body, context);
-        contents = __assign({ name: "StorageQuotaExceededFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new StorageQuotaExceededFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1SubnetAlreadyInUseResponse = 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_1SubnetAlreadyInUse(body, context);
-        contents = __assign({ name: "SubnetAlreadyInUse", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new SubnetAlreadyInUse(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_json1_1UpgradeDependencyFailureFaultResponse = 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_1UpgradeDependencyFailureFault(body, context);
-        contents = __assign({ name: "UpgradeDependencyFailureFault", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new UpgradeDependencyFailureFault(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var serializeAws_json1_1AddTagsToResourceMessage = function (input, context) {
@@ -5480,7 +4762,7 @@ var deserializeAws_json1_1AccountQuota = function (output, context) {
     };
 };
 var deserializeAws_json1_1AccountQuotaList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5488,6 +4770,7 @@ var deserializeAws_json1_1AccountQuotaList = function (output, context) {
         }
         return deserializeAws_json1_1AccountQuota(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1AddTagsToResourceResponse = function (output, context) {
     return {};
@@ -5505,7 +4788,7 @@ var deserializeAws_json1_1AvailabilityZone = function (output, context) {
     };
 };
 var deserializeAws_json1_1AvailabilityZonesList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5513,6 +4796,7 @@ var deserializeAws_json1_1AvailabilityZonesList = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1CancelReplicationTaskAssessmentRunResponse = function (output, context) {
     return {
@@ -5544,7 +4828,7 @@ var deserializeAws_json1_1Certificate = function (output, context) {
     };
 };
 var deserializeAws_json1_1CertificateList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5552,6 +4836,7 @@ var deserializeAws_json1_1CertificateList = function (output, context) {
         }
         return deserializeAws_json1_1Certificate(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1Connection = function (output, context) {
     return {
@@ -5564,7 +4849,7 @@ var deserializeAws_json1_1Connection = function (output, context) {
     };
 };
 var deserializeAws_json1_1ConnectionList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5572,6 +4857,7 @@ var deserializeAws_json1_1ConnectionList = function (output, context) {
         }
         return deserializeAws_json1_1Connection(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1CreateEndpointResponse = function (output, context) {
     return {
@@ -5947,7 +5233,7 @@ var deserializeAws_json1_1Endpoint = function (output, context) {
     };
 };
 var deserializeAws_json1_1EndpointList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5955,6 +5241,7 @@ var deserializeAws_json1_1EndpointList = function (output, context) {
         }
         return deserializeAws_json1_1Endpoint(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1EndpointSetting = function (output, context) {
     return {
@@ -5972,7 +5259,7 @@ var deserializeAws_json1_1EndpointSetting = function (output, context) {
     };
 };
 var deserializeAws_json1_1EndpointSettingEnumValues = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5980,9 +5267,10 @@ var deserializeAws_json1_1EndpointSettingEnumValues = function (output, context)
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1EndpointSettingsList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5990,6 +5278,7 @@ var deserializeAws_json1_1EndpointSettingsList = function (output, context) {
         }
         return deserializeAws_json1_1EndpointSetting(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1Event = function (output, context) {
     return {
@@ -6005,7 +5294,7 @@ var deserializeAws_json1_1Event = function (output, context) {
     };
 };
 var deserializeAws_json1_1EventCategoriesList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6013,6 +5302,7 @@ var deserializeAws_json1_1EventCategoriesList = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1EventCategoryGroup = function (output, context) {
     return {
@@ -6023,7 +5313,7 @@ var deserializeAws_json1_1EventCategoryGroup = function (output, context) {
     };
 };
 var deserializeAws_json1_1EventCategoryGroupList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6031,9 +5321,10 @@ var deserializeAws_json1_1EventCategoryGroupList = function (output, context) {
         }
         return deserializeAws_json1_1EventCategoryGroup(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1EventList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6041,6 +5332,7 @@ var deserializeAws_json1_1EventList = function (output, context) {
         }
         return deserializeAws_json1_1Event(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1EventSubscription = function (output, context) {
     return {
@@ -6060,7 +5352,7 @@ var deserializeAws_json1_1EventSubscription = function (output, context) {
     };
 };
 var deserializeAws_json1_1EventSubscriptionsList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6068,6 +5360,7 @@ var deserializeAws_json1_1EventSubscriptionsList = function (output, context) {
         }
         return deserializeAws_json1_1EventSubscription(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1GcpMySQLSettings = function (output, context) {
     return {
@@ -6109,7 +5402,7 @@ var deserializeAws_json1_1ImportCertificateResponse = function (output, context)
     };
 };
 var deserializeAws_json1_1IndividualAssessmentNameList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6117,6 +5410,7 @@ var deserializeAws_json1_1IndividualAssessmentNameList = function (output, conte
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1InsufficientResourceCapacityFault = function (output, context) {
     return {
@@ -6124,7 +5418,7 @@ var deserializeAws_json1_1InsufficientResourceCapacityFault = function (output,
     };
 };
 var deserializeAws_json1_1IntegerList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6132,6 +5426,7 @@ var deserializeAws_json1_1IntegerList = function (output, context) {
         }
         return __expectInt32(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1InvalidCertificateFault = function (output, context) {
     return {
@@ -6395,7 +5690,7 @@ var deserializeAws_json1_1OrderableReplicationInstance = function (output, conte
     };
 };
 var deserializeAws_json1_1OrderableReplicationInstanceList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6403,6 +5698,7 @@ var deserializeAws_json1_1OrderableReplicationInstanceList = function (output, c
         }
         return deserializeAws_json1_1OrderableReplicationInstance(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1PendingMaintenanceAction = function (output, context) {
     return {
@@ -6421,7 +5717,7 @@ var deserializeAws_json1_1PendingMaintenanceAction = function (output, context)
     };
 };
 var deserializeAws_json1_1PendingMaintenanceActionDetails = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6429,9 +5725,10 @@ var deserializeAws_json1_1PendingMaintenanceActionDetails = function (output, co
         }
         return deserializeAws_json1_1PendingMaintenanceAction(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1PendingMaintenanceActions = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6439,6 +5736,7 @@ var deserializeAws_json1_1PendingMaintenanceActions = function (output, context)
         }
         return deserializeAws_json1_1ResourcePendingMaintenanceActions(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1PostgreSQLSettings = function (output, context) {
     return {
@@ -6583,7 +5881,7 @@ var deserializeAws_json1_1ReplicationInstance = function (output, context) {
     };
 };
 var deserializeAws_json1_1ReplicationInstanceList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6591,9 +5889,10 @@ var deserializeAws_json1_1ReplicationInstanceList = function (output, context) {
         }
         return deserializeAws_json1_1ReplicationInstance(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ReplicationInstancePrivateIpAddressList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6601,9 +5900,10 @@ var deserializeAws_json1_1ReplicationInstancePrivateIpAddressList = function (ou
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ReplicationInstancePublicIpAddressList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6611,6 +5911,7 @@ var deserializeAws_json1_1ReplicationInstancePublicIpAddressList = function (out
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ReplicationInstanceTaskLog = function (output, context) {
     return {
@@ -6620,7 +5921,7 @@ var deserializeAws_json1_1ReplicationInstanceTaskLog = function (output, context
     };
 };
 var deserializeAws_json1_1ReplicationInstanceTaskLogsList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6628,6 +5929,7 @@ var deserializeAws_json1_1ReplicationInstanceTaskLogsList = function (output, co
         }
         return deserializeAws_json1_1ReplicationInstanceTaskLog(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ReplicationPendingModifiedValues = function (output, context) {
     return {
@@ -6654,7 +5956,7 @@ var deserializeAws_json1_1ReplicationSubnetGroupDoesNotCoverEnoughAZs = function
     };
 };
 var deserializeAws_json1_1ReplicationSubnetGroups = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6662,6 +5964,7 @@ var deserializeAws_json1_1ReplicationSubnetGroups = function (output, context) {
         }
         return deserializeAws_json1_1ReplicationSubnetGroup(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ReplicationTask = function (output, context) {
     return {
@@ -6706,7 +6009,7 @@ var deserializeAws_json1_1ReplicationTaskAssessmentResult = function (output, co
     };
 };
 var deserializeAws_json1_1ReplicationTaskAssessmentResultList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6714,6 +6017,7 @@ var deserializeAws_json1_1ReplicationTaskAssessmentResultList = function (output
         }
         return deserializeAws_json1_1ReplicationTaskAssessmentResult(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ReplicationTaskAssessmentRun = function (output, context) {
     return {
@@ -6737,7 +6041,7 @@ var deserializeAws_json1_1ReplicationTaskAssessmentRun = function (output, conte
     };
 };
 var deserializeAws_json1_1ReplicationTaskAssessmentRunList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6745,6 +6049,7 @@ var deserializeAws_json1_1ReplicationTaskAssessmentRunList = function (output, c
         }
         return deserializeAws_json1_1ReplicationTaskAssessmentRun(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ReplicationTaskAssessmentRunProgress = function (output, context) {
     return {
@@ -6765,7 +6070,7 @@ var deserializeAws_json1_1ReplicationTaskIndividualAssessment = function (output
     };
 };
 var deserializeAws_json1_1ReplicationTaskIndividualAssessmentList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6773,9 +6078,10 @@ var deserializeAws_json1_1ReplicationTaskIndividualAssessmentList = function (ou
         }
         return deserializeAws_json1_1ReplicationTaskIndividualAssessment(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ReplicationTaskList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6783,6 +6089,7 @@ var deserializeAws_json1_1ReplicationTaskList = function (output, context) {
         }
         return deserializeAws_json1_1ReplicationTask(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1ReplicationTaskStats = function (output, context) {
     return {
@@ -6886,7 +6193,7 @@ var deserializeAws_json1_1S3Settings = function (output, context) {
     };
 };
 var deserializeAws_json1_1SchemaList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6894,6 +6201,7 @@ var deserializeAws_json1_1SchemaList = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1SNSInvalidTopicFault = function (output, context) {
     return {
@@ -6906,7 +6214,7 @@ var deserializeAws_json1_1SNSNoAuthorizationFault = function (output, context) {
     };
 };
 var deserializeAws_json1_1SourceIdsList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6914,6 +6222,7 @@ var deserializeAws_json1_1SourceIdsList = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_json1_1StartReplicationTaskAssessmentResponse = function (output, context) {
     return {
@@ -6963,7 +6272,7 @@ var deserializeAws_json1_1SubnetAlreadyInUse = function (output, context) {
     };
 };
 var deserializeAws_json1_1SubnetList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6971,6 +6280,7 @@ var deserializeAws_json1_1SubnetList = function (output, context) {
         }
         return deserializeAws_json1_1Subnet(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1SupportedEndpointType = function (output, context) {
     return {
@@ -6982,7 +6292,7 @@ var deserializeAws_json1_1SupportedEndpointType = function (output, context) {
     };
 };
 var deserializeAws_json1_1SupportedEndpointTypeList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6990,6 +6300,7 @@ var deserializeAws_json1_1SupportedEndpointTypeList = function (output, context)
         }
         return deserializeAws_json1_1SupportedEndpointType(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1SybaseSettings = function (output, context) {
     return {
@@ -7032,7 +6343,7 @@ var deserializeAws_json1_1TableStatistics = function (output, context) {
     };
 };
 var deserializeAws_json1_1TableStatisticsList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -7040,6 +6351,7 @@ var deserializeAws_json1_1TableStatisticsList = function (output, context) {
         }
         return deserializeAws_json1_1TableStatistics(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1Tag = function (output, context) {
     return {
@@ -7049,7 +6361,7 @@ var deserializeAws_json1_1Tag = function (output, context) {
     };
 };
 var deserializeAws_json1_1TagList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -7057,6 +6369,7 @@ var deserializeAws_json1_1TagList = function (output, context) {
         }
         return deserializeAws_json1_1Tag(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_json1_1TestConnectionResponse = function (output, context) {
     return {
@@ -7077,7 +6390,7 @@ var deserializeAws_json1_1VpcSecurityGroupMembership = function (output, context
     };
 };
 var deserializeAws_json1_1VpcSecurityGroupMembershipList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -7085,6 +6398,7 @@ var deserializeAws_json1_1VpcSecurityGroupMembershipList = function (output, con
         }
         return deserializeAws_json1_1VpcSecurityGroupMembership(entry, context);
     });
+    return retVal;
 };
 var deserializeMetadata = function (output) {
     var _a;