@aws-sdk/client-elastic-beanstalk 3.51.0 → 3.54.0

package/dist-es/protocols/Aws_query.js

@@ -1,8 +1,10 @@
 import { __assign, __awaiter, __generator, __read, __values } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { expectNonNull as __expectNonNull, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, getArrayIfSingleItem as __getArrayIfSingleItem, getValueFromTextNode as __getValueFromTextNode, parseBoolean as __parseBoolean, parseRfc3339DateTime as __parseRfc3339DateTime, strictParseFloat as __strictParseFloat, strictParseInt32 as __strictParseInt32, strictParseLong as __strictParseLong, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectNonNull as __expectNonNull, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, getArrayIfSingleItem as __getArrayIfSingleItem, getValueFromTextNode as __getValueFromTextNode, parseBoolean as __parseBoolean, parseRfc3339DateTime as __parseRfc3339DateTime, strictParseFloat as __strictParseFloat, strictParseInt32 as __strictParseInt32, strictParseLong as __strictParseLong, } from "@aws-sdk/smithy-client";
 import { decodeHTML } from "entities";
 import { parse as xmlParse } from "fast-xml-parser";
+import { ElasticBeanstalkServiceException as __BaseException } from "../models/ElasticBeanstalkServiceException";
+import { CodeBuildNotInServiceRegionException, ElasticBeanstalkServiceException, InsufficientPrivilegesException, InvalidRequestException, ManagedActionInvalidStateException, OperationInProgressException, PlatformVersionStillReferencedException, ResourceNotFoundException, ResourceTypeNotSupportedException, S3LocationNotInServiceRegionException, S3SubscriptionRequiredException, SourceBundleDeletionException, TooManyApplicationsException, TooManyApplicationVersionsException, TooManyBucketsException, TooManyConfigurationTemplatesException, TooManyEnvironmentsException, TooManyPlatformsException, TooManyTagsException, } from "../models/models_0";
 export var serializeAws_queryAbortEnvironmentUpdateCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
     var headers, body;
     return __generator(this, function (_a) {
@@ -501,16 +503,16 @@ export var deserializeAws_queryAbortEnvironmentUpdateCommand = function (output,
     });
 }); };
 var deserializeAws_queryAbortEnvironmentUpdateCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -519,22 +521,16 @@ var deserializeAws_queryAbortEnvironmentUpdateCommandError = function (output, c
                     case "com.amazonaws.elasticbeanstalk#InsufficientPrivilegesException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -557,16 +553,16 @@ export var deserializeAws_queryApplyEnvironmentManagedActionCommand = function (
     });
 }); };
 var deserializeAws_queryApplyEnvironmentManagedActionCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -577,28 +573,18 @@ var deserializeAws_queryApplyEnvironmentManagedActionCommandError = function (ou
                     case "com.amazonaws.elasticbeanstalk#ManagedActionInvalidStateException": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryElasticBeanstalkServiceExceptionResponse(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_queryManagedActionInvalidStateExceptionResponse(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_queryElasticBeanstalkServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryManagedActionInvalidStateExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -621,16 +607,16 @@ export var deserializeAws_queryAssociateEnvironmentOperationsRoleCommand = funct
     });
 }); };
 var deserializeAws_queryAssociateEnvironmentOperationsRoleCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -639,22 +625,16 @@ var deserializeAws_queryAssociateEnvironmentOperationsRoleCommandError = functio
                     case "com.amazonaws.elasticbeanstalk#InsufficientPrivilegesException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -677,7 +657,7 @@ export var deserializeAws_queryCheckDNSAvailabilityCommand = function (output, c
     });
 }); };
 var deserializeAws_queryCheckDNSAvailabilityCommandError = 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) {
@@ -692,13 +672,14 @@ var deserializeAws_queryCheckDNSAvailabilityCommandError = function (output, con
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -721,16 +702,16 @@ export var deserializeAws_queryComposeEnvironmentsCommand = function (output, co
     });
 }); };
 var deserializeAws_queryComposeEnvironmentsCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -741,28 +722,18 @@ var deserializeAws_queryComposeEnvironmentsCommandError = function (output, cont
                     case "com.amazonaws.elasticbeanstalk#TooManyEnvironmentsException": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryTooManyEnvironmentsExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryTooManyEnvironmentsExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -785,16 +756,16 @@ export var deserializeAws_queryCreateApplicationCommand = function (output, cont
     });
 }); };
 var deserializeAws_queryCreateApplicationCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -803,22 +774,16 @@ var deserializeAws_queryCreateApplicationCommandError = function (output, contex
                     case "com.amazonaws.elasticbeanstalk#TooManyApplicationsException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryTooManyApplicationsExceptionResponse(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_queryTooManyApplicationsExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -841,16 +806,16 @@ export var deserializeAws_queryCreateApplicationVersionCommand = function (outpu
     });
 }); };
 var deserializeAws_queryCreateApplicationVersionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -867,46 +832,24 @@ var deserializeAws_queryCreateApplicationVersionCommandError = function (output,
                     case "com.amazonaws.elasticbeanstalk#TooManyApplicationVersionsException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryCodeBuildNotInServiceRegionExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(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_queryS3LocationNotInServiceRegionExceptionResponse(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_queryTooManyApplicationsExceptionResponse(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_queryTooManyApplicationVersionsExceptionResponse(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_queryCodeBuildNotInServiceRegionExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryS3LocationNotInServiceRegionExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryTooManyApplicationsExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryTooManyApplicationVersionsExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -929,16 +872,16 @@ export var deserializeAws_queryCreateConfigurationTemplateCommand = function (ou
     });
 }); };
 var deserializeAws_queryCreateConfigurationTemplateCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -951,34 +894,20 @@ var deserializeAws_queryCreateConfigurationTemplateCommandError = function (outp
                     case "com.amazonaws.elasticbeanstalk#TooManyConfigurationTemplatesException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryTooManyBucketsExceptionResponse(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_queryTooManyConfigurationTemplatesExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryTooManyBucketsExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryTooManyConfigurationTemplatesExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1001,16 +930,16 @@ export var deserializeAws_queryCreateEnvironmentCommand = function (output, cont
     });
 }); };
 var deserializeAws_queryCreateEnvironmentCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1021,28 +950,18 @@ var deserializeAws_queryCreateEnvironmentCommandError = function (output, contex
                     case "com.amazonaws.elasticbeanstalk#TooManyEnvironmentsException": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryTooManyEnvironmentsExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryTooManyEnvironmentsExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1065,16 +984,16 @@ export var deserializeAws_queryCreatePlatformVersionCommand = function (output,
     });
 }); };
 var deserializeAws_queryCreatePlatformVersionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1087,34 +1006,20 @@ var deserializeAws_queryCreatePlatformVersionCommandError = function (output, co
                     case "com.amazonaws.elasticbeanstalk#TooManyPlatformsException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryElasticBeanstalkServiceExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(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_queryTooManyPlatformsExceptionResponse(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_queryElasticBeanstalkServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryTooManyPlatformsExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1137,16 +1042,16 @@ export var deserializeAws_queryCreateStorageLocationCommand = function (output,
     });
 }); };
 var deserializeAws_queryCreateStorageLocationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1159,34 +1064,20 @@ var deserializeAws_queryCreateStorageLocationCommandError = function (output, co
                     case "com.amazonaws.elasticbeanstalk#TooManyBucketsException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryS3SubscriptionRequiredExceptionResponse(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_queryTooManyBucketsExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryS3SubscriptionRequiredExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryTooManyBucketsExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1209,16 +1100,16 @@ export var deserializeAws_queryDeleteApplicationCommand = function (output, cont
     });
 }); };
 var deserializeAws_queryDeleteApplicationCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1227,22 +1118,16 @@ var deserializeAws_queryDeleteApplicationCommandError = function (output, contex
                     case "com.amazonaws.elasticbeanstalk#OperationInProgressException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryOperationInProgressExceptionResponse(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_queryOperationInProgressExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1265,16 +1150,16 @@ export var deserializeAws_queryDeleteApplicationVersionCommand = function (outpu
     });
 }); };
 var deserializeAws_queryDeleteApplicationVersionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1289,40 +1174,22 @@ var deserializeAws_queryDeleteApplicationVersionCommandError = function (output,
                     case "com.amazonaws.elasticbeanstalk#SourceBundleDeletionException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryOperationInProgressExceptionResponse(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_queryS3LocationNotInServiceRegionExceptionResponse(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_querySourceBundleDeletionExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryOperationInProgressExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryS3LocationNotInServiceRegionExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_querySourceBundleDeletionExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1345,16 +1212,16 @@ export var deserializeAws_queryDeleteConfigurationTemplateCommand = function (ou
     });
 }); };
 var deserializeAws_queryDeleteConfigurationTemplateCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1363,22 +1230,16 @@ var deserializeAws_queryDeleteConfigurationTemplateCommandError = function (outp
                     case "com.amazonaws.elasticbeanstalk#OperationInProgressException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryOperationInProgressExceptionResponse(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_queryOperationInProgressExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1401,7 +1262,7 @@ export var deserializeAws_queryDeleteEnvironmentConfigurationCommand = function
     });
 }); };
 var deserializeAws_queryDeleteEnvironmentConfigurationCommandError = 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) {
@@ -1416,13 +1277,14 @@ var deserializeAws_queryDeleteEnvironmentConfigurationCommandError = function (o
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -1445,16 +1307,16 @@ export var deserializeAws_queryDeletePlatformVersionCommand = function (output,
     });
 }); };
 var deserializeAws_queryDeletePlatformVersionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1469,40 +1331,22 @@ var deserializeAws_queryDeletePlatformVersionCommandError = function (output, co
                     case "com.amazonaws.elasticbeanstalk#PlatformVersionStillReferencedException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryElasticBeanstalkServiceExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(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_queryOperationInProgressExceptionResponse(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_queryPlatformVersionStillReferencedExceptionResponse(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_queryElasticBeanstalkServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryOperationInProgressExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryPlatformVersionStillReferencedExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1525,16 +1369,16 @@ export var deserializeAws_queryDescribeAccountAttributesCommand = function (outp
     });
 }); };
 var deserializeAws_queryDescribeAccountAttributesCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1543,22 +1387,16 @@ var deserializeAws_queryDescribeAccountAttributesCommandError = function (output
                     case "com.amazonaws.elasticbeanstalk#InsufficientPrivilegesException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1581,7 +1419,7 @@ export var deserializeAws_queryDescribeApplicationsCommand = function (output, c
     });
 }); };
 var deserializeAws_queryDescribeApplicationsCommandError = 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) {
@@ -1596,13 +1434,14 @@ var deserializeAws_queryDescribeApplicationsCommandError = function (output, con
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -1625,7 +1464,7 @@ export var deserializeAws_queryDescribeApplicationVersionsCommand = function (ou
     });
 }); };
 var deserializeAws_queryDescribeApplicationVersionsCommandError = 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) {
@@ -1640,13 +1479,14 @@ var deserializeAws_queryDescribeApplicationVersionsCommandError = function (outp
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -1669,16 +1509,16 @@ export var deserializeAws_queryDescribeConfigurationOptionsCommand = function (o
     });
 }); };
 var deserializeAws_queryDescribeConfigurationOptionsCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1687,22 +1527,16 @@ var deserializeAws_queryDescribeConfigurationOptionsCommandError = function (out
                     case "com.amazonaws.elasticbeanstalk#TooManyBucketsException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryTooManyBucketsExceptionResponse(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_queryTooManyBucketsExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1725,16 +1559,16 @@ export var deserializeAws_queryDescribeConfigurationSettingsCommand = function (
     });
 }); };
 var deserializeAws_queryDescribeConfigurationSettingsCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1743,22 +1577,16 @@ var deserializeAws_queryDescribeConfigurationSettingsCommandError = function (ou
                     case "com.amazonaws.elasticbeanstalk#TooManyBucketsException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryTooManyBucketsExceptionResponse(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_queryTooManyBucketsExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1781,16 +1609,16 @@ export var deserializeAws_queryDescribeEnvironmentHealthCommand = function (outp
     });
 }); };
 var deserializeAws_queryDescribeEnvironmentHealthCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1801,28 +1629,18 @@ var deserializeAws_queryDescribeEnvironmentHealthCommandError = function (output
                     case "com.amazonaws.elasticbeanstalk#InvalidRequestException": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryElasticBeanstalkServiceExceptionResponse(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_queryInvalidRequestExceptionResponse(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_queryElasticBeanstalkServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInvalidRequestExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1845,16 +1663,16 @@ export var deserializeAws_queryDescribeEnvironmentManagedActionHistoryCommand =
     });
 }); };
 var deserializeAws_queryDescribeEnvironmentManagedActionHistoryCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1863,22 +1681,16 @@ var deserializeAws_queryDescribeEnvironmentManagedActionHistoryCommandError = fu
                     case "com.amazonaws.elasticbeanstalk#ElasticBeanstalkServiceException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryElasticBeanstalkServiceExceptionResponse(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_queryElasticBeanstalkServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1901,16 +1713,16 @@ export var deserializeAws_queryDescribeEnvironmentManagedActionsCommand = functi
     });
 }); };
 var deserializeAws_queryDescribeEnvironmentManagedActionsCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1919,22 +1731,16 @@ var deserializeAws_queryDescribeEnvironmentManagedActionsCommandError = function
                     case "com.amazonaws.elasticbeanstalk#ElasticBeanstalkServiceException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryElasticBeanstalkServiceExceptionResponse(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_queryElasticBeanstalkServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -1957,16 +1763,16 @@ export var deserializeAws_queryDescribeEnvironmentResourcesCommand = function (o
     });
 }); };
 var deserializeAws_queryDescribeEnvironmentResourcesCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1975,22 +1781,16 @@ var deserializeAws_queryDescribeEnvironmentResourcesCommandError = function (out
                     case "com.amazonaws.elasticbeanstalk#InsufficientPrivilegesException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -2013,7 +1813,7 @@ export var deserializeAws_queryDescribeEnvironmentsCommand = function (output, c
     });
 }); };
 var deserializeAws_queryDescribeEnvironmentsCommandError = 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) {
@@ -2028,13 +1828,14 @@ var deserializeAws_queryDescribeEnvironmentsCommandError = function (output, con
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2057,7 +1858,7 @@ export var deserializeAws_queryDescribeEventsCommand = function (output, context
     });
 }); };
 var deserializeAws_queryDescribeEventsCommandError = 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) {
@@ -2072,13 +1873,14 @@ var deserializeAws_queryDescribeEventsCommandError = function (output, context)
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2101,16 +1903,16 @@ export var deserializeAws_queryDescribeInstancesHealthCommand = function (output
     });
 }); };
 var deserializeAws_queryDescribeInstancesHealthCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2121,28 +1923,18 @@ var deserializeAws_queryDescribeInstancesHealthCommandError = function (output,
                     case "com.amazonaws.elasticbeanstalk#InvalidRequestException": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryElasticBeanstalkServiceExceptionResponse(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_queryInvalidRequestExceptionResponse(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_queryElasticBeanstalkServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInvalidRequestExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -2165,16 +1957,16 @@ export var deserializeAws_queryDescribePlatformVersionCommand = function (output
     });
 }); };
 var deserializeAws_queryDescribePlatformVersionCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2185,28 +1977,18 @@ var deserializeAws_queryDescribePlatformVersionCommandError = function (output,
                     case "com.amazonaws.elasticbeanstalk#InsufficientPrivilegesException": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryElasticBeanstalkServiceExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(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_queryElasticBeanstalkServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -2229,16 +2011,16 @@ export var deserializeAws_queryDisassociateEnvironmentOperationsRoleCommand = fu
     });
 }); };
 var deserializeAws_queryDisassociateEnvironmentOperationsRoleCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2247,22 +2029,16 @@ var deserializeAws_queryDisassociateEnvironmentOperationsRoleCommandError = func
                     case "com.amazonaws.elasticbeanstalk#InsufficientPrivilegesException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -2285,7 +2061,7 @@ export var deserializeAws_queryListAvailableSolutionStacksCommand = function (ou
     });
 }); };
 var deserializeAws_queryListAvailableSolutionStacksCommandError = 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) {
@@ -2300,13 +2076,14 @@ var deserializeAws_queryListAvailableSolutionStacksCommandError = function (outp
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2329,7 +2106,7 @@ export var deserializeAws_queryListPlatformBranchesCommand = function (output, c
     });
 }); };
 var deserializeAws_queryListPlatformBranchesCommandError = 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) {
@@ -2344,13 +2121,14 @@ var deserializeAws_queryListPlatformBranchesCommandError = function (output, con
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2373,16 +2151,16 @@ export var deserializeAws_queryListPlatformVersionsCommand = function (output, c
     });
 }); };
 var deserializeAws_queryListPlatformVersionsCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2393,28 +2171,18 @@ var deserializeAws_queryListPlatformVersionsCommandError = function (output, con
                     case "com.amazonaws.elasticbeanstalk#InsufficientPrivilegesException": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryElasticBeanstalkServiceExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(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_queryElasticBeanstalkServiceExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -2437,16 +2205,16 @@ export var deserializeAws_queryListTagsForResourceCommand = function (output, co
     });
 }); };
 var deserializeAws_queryListTagsForResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2459,34 +2227,20 @@ var deserializeAws_queryListTagsForResourceCommandError = function (output, cont
                     case "com.amazonaws.elasticbeanstalk#ResourceTypeNotSupportedException": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryResourceNotFoundExceptionResponse(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_queryResourceTypeNotSupportedExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryResourceTypeNotSupportedExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -2509,16 +2263,16 @@ export var deserializeAws_queryRebuildEnvironmentCommand = function (output, con
     });
 }); };
 var deserializeAws_queryRebuildEnvironmentCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2527,22 +2281,16 @@ var deserializeAws_queryRebuildEnvironmentCommandError = function (output, conte
                     case "com.amazonaws.elasticbeanstalk#InsufficientPrivilegesException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -2565,7 +2313,7 @@ export var deserializeAws_queryRequestEnvironmentInfoCommand = function (output,
     });
 }); };
 var deserializeAws_queryRequestEnvironmentInfoCommandError = 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) {
@@ -2580,13 +2328,14 @@ var deserializeAws_queryRequestEnvironmentInfoCommandError = function (output, c
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2609,7 +2358,7 @@ export var deserializeAws_queryRestartAppServerCommand = function (output, conte
     });
 }); };
 var deserializeAws_queryRestartAppServerCommandError = 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) {
@@ -2624,13 +2373,14 @@ var deserializeAws_queryRestartAppServerCommandError = function (output, context
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2653,7 +2403,7 @@ export var deserializeAws_queryRetrieveEnvironmentInfoCommand = function (output
     });
 }); };
 var deserializeAws_queryRetrieveEnvironmentInfoCommandError = 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) {
@@ -2668,13 +2418,14 @@ var deserializeAws_queryRetrieveEnvironmentInfoCommandError = function (output,
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2697,7 +2448,7 @@ export var deserializeAws_querySwapEnvironmentCNAMEsCommand = function (output,
     });
 }); };
 var deserializeAws_querySwapEnvironmentCNAMEsCommandError = 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) {
@@ -2712,13 +2463,14 @@ var deserializeAws_querySwapEnvironmentCNAMEsCommandError = function (output, co
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2741,16 +2493,16 @@ export var deserializeAws_queryTerminateEnvironmentCommand = function (output, c
     });
 }); };
 var deserializeAws_queryTerminateEnvironmentCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2759,22 +2511,16 @@ var deserializeAws_queryTerminateEnvironmentCommandError = function (output, con
                     case "com.amazonaws.elasticbeanstalk#InsufficientPrivilegesException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -2797,7 +2543,7 @@ export var deserializeAws_queryUpdateApplicationCommand = function (output, cont
     });
 }); };
 var deserializeAws_queryUpdateApplicationCommandError = 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) {
@@ -2812,13 +2558,14 @@ var deserializeAws_queryUpdateApplicationCommandError = function (output, contex
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2841,16 +2588,16 @@ export var deserializeAws_queryUpdateApplicationResourceLifecycleCommand = funct
     });
 }); };
 var deserializeAws_queryUpdateApplicationResourceLifecycleCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2859,22 +2606,16 @@ var deserializeAws_queryUpdateApplicationResourceLifecycleCommandError = functio
                     case "com.amazonaws.elasticbeanstalk#InsufficientPrivilegesException": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -2897,7 +2638,7 @@ export var deserializeAws_queryUpdateApplicationVersionCommand = function (outpu
     });
 }); };
 var deserializeAws_queryUpdateApplicationVersionCommandError = 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) {
@@ -2912,13 +2653,14 @@ var deserializeAws_queryUpdateApplicationVersionCommandError = function (output,
                 switch (errorCode) {
                     default:
                         parsedBody = parsedOutput.body;
-                        errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                        response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                        response = new __BaseException({
+                            name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                            $fault: "client",
+                            $metadata: deserializeMetadata(output),
+                        });
+                        throw __decorateServiceException(response, parsedBody.Error);
                 }
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                return [2];
         }
     });
 }); };
@@ -2941,16 +2683,16 @@ export var deserializeAws_queryUpdateConfigurationTemplateCommand = function (ou
     });
 }); };
 var deserializeAws_queryUpdateConfigurationTemplateCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2961,28 +2703,18 @@ var deserializeAws_queryUpdateConfigurationTemplateCommandError = function (outp
                     case "com.amazonaws.elasticbeanstalk#TooManyBucketsException": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryTooManyBucketsExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryTooManyBucketsExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -3005,16 +2737,16 @@ export var deserializeAws_queryUpdateEnvironmentCommand = function (output, cont
     });
 }); };
 var deserializeAws_queryUpdateEnvironmentCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3025,28 +2757,18 @@ var deserializeAws_queryUpdateEnvironmentCommandError = function (output, contex
                     case "com.amazonaws.elasticbeanstalk#TooManyBucketsException": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryTooManyBucketsExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryTooManyBucketsExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -3069,16 +2791,16 @@ export var deserializeAws_queryUpdateTagsForResourceCommand = function (output,
     });
 }); };
 var deserializeAws_queryUpdateTagsForResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3095,46 +2817,24 @@ var deserializeAws_queryUpdateTagsForResourceCommandError = function (output, co
                     case "com.amazonaws.elasticbeanstalk#TooManyTagsException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryOperationInProgressExceptionResponse(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_queryResourceNotFoundExceptionResponse(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_queryResourceTypeNotSupportedExceptionResponse(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_queryTooManyTagsExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryOperationInProgressExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_queryResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_queryResourceTypeNotSupportedExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_queryTooManyTagsExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
@@ -3157,16 +2857,16 @@ export var deserializeAws_queryValidateConfigurationSettingsCommand = function (
     });
 }); };
 var deserializeAws_queryValidateConfigurationSettingsCommandError = 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 = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3177,200 +2877,190 @@ var deserializeAws_queryValidateConfigurationSettingsCommandError = function (ou
                     case "com.amazonaws.elasticbeanstalk#TooManyBucketsException": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_queryInsufficientPrivilegesExceptionResponse(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_queryTooManyBucketsExceptionResponse(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_queryInsufficientPrivilegesExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_queryTooManyBucketsExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.Error.code || parsedBody.Error.Code || errorCode;
-                response = __assign(__assign({}, parsedBody.Error), { name: "" + errorCode, message: parsedBody.Error.message || parsedBody.Error.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.Error.code || parsedBody.Error.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody.Error);
         }
     });
 }); };
 var deserializeAws_queryCodeBuildNotInServiceRegionExceptionResponse = 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_queryCodeBuildNotInServiceRegionException(body.Error, context);
-        contents = __assign({ name: "CodeBuildNotInServiceRegionException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new CodeBuildNotInServiceRegionException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryElasticBeanstalkServiceExceptionResponse = 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_queryElasticBeanstalkServiceException(body.Error, context);
-        contents = __assign({ name: "ElasticBeanstalkServiceException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ElasticBeanstalkServiceException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryInsufficientPrivilegesExceptionResponse = 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_queryInsufficientPrivilegesException(body.Error, context);
-        contents = __assign({ name: "InsufficientPrivilegesException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InsufficientPrivilegesException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryInvalidRequestExceptionResponse = 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_queryInvalidRequestException(body.Error, context);
-        contents = __assign({ name: "InvalidRequestException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new InvalidRequestException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryManagedActionInvalidStateExceptionResponse = 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_queryManagedActionInvalidStateException(body.Error, context);
-        contents = __assign({ name: "ManagedActionInvalidStateException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ManagedActionInvalidStateException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryOperationInProgressExceptionResponse = 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_queryOperationInProgressException(body.Error, context);
-        contents = __assign({ name: "OperationInProgressException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new OperationInProgressException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryPlatformVersionStillReferencedExceptionResponse = 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_queryPlatformVersionStillReferencedException(body.Error, context);
-        contents = __assign({ name: "PlatformVersionStillReferencedException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new PlatformVersionStillReferencedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryResourceNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var body, deserialized, contents;
+    var body, deserialized, exception;
     return __generator(this, function (_a) {
         body = parsedOutput.body;
         deserialized = deserializeAws_queryResourceNotFoundException(body.Error, context);
-        contents = __assign({ name: "ResourceNotFoundException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ResourceNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryResourceTypeNotSupportedExceptionResponse = 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_queryResourceTypeNotSupportedException(body.Error, context);
-        contents = __assign({ name: "ResourceTypeNotSupportedException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new ResourceTypeNotSupportedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryS3LocationNotInServiceRegionExceptionResponse = 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_queryS3LocationNotInServiceRegionException(body.Error, context);
-        contents = __assign({ name: "S3LocationNotInServiceRegionException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new S3LocationNotInServiceRegionException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryS3SubscriptionRequiredExceptionResponse = 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_queryS3SubscriptionRequiredException(body.Error, context);
-        contents = __assign({ name: "S3SubscriptionRequiredException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new S3SubscriptionRequiredException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_querySourceBundleDeletionExceptionResponse = 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_querySourceBundleDeletionException(body.Error, context);
-        contents = __assign({ name: "SourceBundleDeletionException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new SourceBundleDeletionException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryTooManyApplicationsExceptionResponse = 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_queryTooManyApplicationsException(body.Error, context);
-        contents = __assign({ name: "TooManyApplicationsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TooManyApplicationsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryTooManyApplicationVersionsExceptionResponse = 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_queryTooManyApplicationVersionsException(body.Error, context);
-        contents = __assign({ name: "TooManyApplicationVersionsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TooManyApplicationVersionsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryTooManyBucketsExceptionResponse = 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_queryTooManyBucketsException(body.Error, context);
-        contents = __assign({ name: "TooManyBucketsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TooManyBucketsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryTooManyConfigurationTemplatesExceptionResponse = 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_queryTooManyConfigurationTemplatesException(body.Error, context);
-        contents = __assign({ name: "TooManyConfigurationTemplatesException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TooManyConfigurationTemplatesException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryTooManyEnvironmentsExceptionResponse = 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_queryTooManyEnvironmentsException(body.Error, context);
-        contents = __assign({ name: "TooManyEnvironmentsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TooManyEnvironmentsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryTooManyPlatformsExceptionResponse = 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_queryTooManyPlatformsException(body.Error, context);
-        contents = __assign({ name: "TooManyPlatformsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TooManyPlatformsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var deserializeAws_queryTooManyTagsExceptionResponse = 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_queryTooManyTagsException(body.Error, context);
-        contents = __assign({ name: "TooManyTagsException", $fault: "client", $metadata: deserializeMetadata(parsedOutput) }, deserialized);
-        return [2, contents];
+        exception = new TooManyTagsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, deserialized));
+        return [2, __decorateServiceException(exception, body)];
     });
 }); };
 var serializeAws_queryAbortEnvironmentUpdateMessage = function (input, context) {