@aws-sdk/client-workspaces-web 3.50.0 → 3.53.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,7 +1,9 @@
 import { __assign, __awaiter, __generator, __read } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, parseEpochTimestamp as __parseEpochTimestamp, strictParseInt32 as __strictParseInt32, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, parseEpochTimestamp as __parseEpochTimestamp, strictParseInt32 as __strictParseInt32, } from "@aws-sdk/smithy-client";
 import { v4 as generateIdempotencyToken } from "uuid";
+import { AccessDeniedException, ConflictException, InternalServerException, ResourceNotFoundException, ServiceQuotaExceededException, ThrottlingException, TooManyTagsException, ValidationException, } from "../models/models_0";
+import { WorkSpacesWebServiceException as __BaseException } from "../models/WorkSpacesWebServiceException";
 export var serializeAws_restJson1AssociateBrowserSettingsCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
     return __generator(this, function (_c) {
@@ -1505,16 +1507,16 @@ export var deserializeAws_restJson1AssociateBrowserSettingsCommand = function (o
     });
 }); };
 var deserializeAws_restJson1AssociateBrowserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1533,52 +1535,26 @@ var deserializeAws_restJson1AssociateBrowserSettingsCommandError = function (out
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1611,16 +1587,16 @@ export var deserializeAws_restJson1AssociateNetworkSettingsCommand = function (o
     });
 }); };
 var deserializeAws_restJson1AssociateNetworkSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1639,52 +1615,26 @@ var deserializeAws_restJson1AssociateNetworkSettingsCommandError = function (out
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1717,16 +1667,16 @@ export var deserializeAws_restJson1AssociateTrustStoreCommand = function (output
     });
 }); };
 var deserializeAws_restJson1AssociateTrustStoreCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1743,46 +1693,24 @@ var deserializeAws_restJson1AssociateTrustStoreCommandError = function (output,
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1815,16 +1743,16 @@ export var deserializeAws_restJson1AssociateUserSettingsCommand = function (outp
     });
 }); };
 var deserializeAws_restJson1AssociateUserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1843,52 +1771,26 @@ var deserializeAws_restJson1AssociateUserSettingsCommandError = function (output
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1917,16 +1819,16 @@ export var deserializeAws_restJson1CreateBrowserSettingsCommand = function (outp
     });
 }); };
 var deserializeAws_restJson1CreateBrowserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, parsedBody, message;
-    var _k;
-    return __generator(this, function (_l) {
-        switch (_l.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _k = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_k.body = _l.sent(), _k)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1947,58 +1849,28 @@ var deserializeAws_restJson1CreateBrowserSettingsCommandError = function (output
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
+            case 2: return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _l.label = 17;
-            case 17:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2027,16 +1899,16 @@ export var deserializeAws_restJson1CreateIdentityProviderCommand = function (out
     });
 }); };
 var deserializeAws_restJson1CreateIdentityProviderCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2055,52 +1927,26 @@ var deserializeAws_restJson1CreateIdentityProviderCommandError = function (outpu
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2129,16 +1975,16 @@ export var deserializeAws_restJson1CreateNetworkSettingsCommand = function (outp
     });
 }); };
 var deserializeAws_restJson1CreateNetworkSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2157,52 +2003,26 @@ var deserializeAws_restJson1CreateNetworkSettingsCommandError = function (output
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2235,16 +2055,16 @@ export var deserializeAws_restJson1CreatePortalCommand = function (output, conte
     });
 }); };
 var deserializeAws_restJson1CreatePortalCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, parsedBody, message;
-    var _k;
-    return __generator(this, function (_l) {
-        switch (_l.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _k = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_k.body = _l.sent(), _k)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2265,58 +2085,28 @@ var deserializeAws_restJson1CreatePortalCommandError = function (output, context
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_l.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 17];
+            case 2: return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _l.label = 17;
-            case 17:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2345,16 +2135,16 @@ export var deserializeAws_restJson1CreateTrustStoreCommand = function (output, c
     });
 }); };
 var deserializeAws_restJson1CreateTrustStoreCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2373,52 +2163,26 @@ var deserializeAws_restJson1CreateTrustStoreCommandError = function (output, con
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2447,16 +2211,16 @@ export var deserializeAws_restJson1CreateUserSettingsCommand = function (output,
     });
 }); };
 var deserializeAws_restJson1CreateUserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2475,52 +2239,26 @@ var deserializeAws_restJson1CreateUserSettingsCommandError = function (output, c
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2543,16 +2281,16 @@ export var deserializeAws_restJson1DeleteBrowserSettingsCommand = function (outp
     });
 }); };
 var deserializeAws_restJson1DeleteBrowserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2569,46 +2307,24 @@ var deserializeAws_restJson1DeleteBrowserSettingsCommandError = function (output
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1ConflictExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2631,16 +2347,16 @@ export var deserializeAws_restJson1DeleteIdentityProviderCommand = function (out
     });
 }); };
 var deserializeAws_restJson1DeleteIdentityProviderCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2657,46 +2373,24 @@ var deserializeAws_restJson1DeleteIdentityProviderCommandError = function (outpu
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1ConflictExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2719,16 +2413,16 @@ export var deserializeAws_restJson1DeleteNetworkSettingsCommand = function (outp
     });
 }); };
 var deserializeAws_restJson1DeleteNetworkSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2745,46 +2439,24 @@ var deserializeAws_restJson1DeleteNetworkSettingsCommandError = function (output
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1ConflictExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2807,16 +2479,16 @@ export var deserializeAws_restJson1DeletePortalCommand = function (output, conte
     });
 }); };
 var deserializeAws_restJson1DeletePortalCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2833,46 +2505,24 @@ var deserializeAws_restJson1DeletePortalCommandError = function (output, context
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1ConflictExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2895,16 +2545,16 @@ export var deserializeAws_restJson1DeleteTrustStoreCommand = function (output, c
     });
 }); };
 var deserializeAws_restJson1DeleteTrustStoreCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2921,46 +2571,24 @@ var deserializeAws_restJson1DeleteTrustStoreCommandError = function (output, con
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1ConflictExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2983,16 +2611,16 @@ export var deserializeAws_restJson1DeleteUserSettingsCommand = function (output,
     });
 }); };
 var deserializeAws_restJson1DeleteUserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3009,46 +2637,24 @@ var deserializeAws_restJson1DeleteUserSettingsCommandError = function (output, c
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1ConflictExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3071,16 +2677,16 @@ export var deserializeAws_restJson1DisassociateBrowserSettingsCommand = function
     });
 }); };
 var deserializeAws_restJson1DisassociateBrowserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3097,46 +2703,24 @@ var deserializeAws_restJson1DisassociateBrowserSettingsCommandError = function (
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3159,16 +2743,16 @@ export var deserializeAws_restJson1DisassociateNetworkSettingsCommand = function
     });
 }); };
 var deserializeAws_restJson1DisassociateNetworkSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3185,46 +2769,24 @@ var deserializeAws_restJson1DisassociateNetworkSettingsCommandError = function (
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3247,16 +2809,16 @@ export var deserializeAws_restJson1DisassociateTrustStoreCommand = function (out
     });
 }); };
 var deserializeAws_restJson1DisassociateTrustStoreCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3273,46 +2835,24 @@ var deserializeAws_restJson1DisassociateTrustStoreCommandError = function (outpu
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3335,16 +2875,16 @@ export var deserializeAws_restJson1DisassociateUserSettingsCommand = function (o
     });
 }); };
 var deserializeAws_restJson1DisassociateUserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3361,46 +2901,24 @@ var deserializeAws_restJson1DisassociateUserSettingsCommandError = function (out
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3429,16 +2947,16 @@ export var deserializeAws_restJson1GetBrowserSettingsCommand = function (output,
     });
 }); };
 var deserializeAws_restJson1GetBrowserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3455,46 +2973,24 @@ var deserializeAws_restJson1GetBrowserSettingsCommandError = function (output, c
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3523,16 +3019,16 @@ export var deserializeAws_restJson1GetIdentityProviderCommand = function (output
     });
 }); };
 var deserializeAws_restJson1GetIdentityProviderCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3549,46 +3045,24 @@ var deserializeAws_restJson1GetIdentityProviderCommandError = function (output,
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3617,16 +3091,16 @@ export var deserializeAws_restJson1GetNetworkSettingsCommand = function (output,
     });
 }); };
 var deserializeAws_restJson1GetNetworkSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3643,46 +3117,24 @@ var deserializeAws_restJson1GetNetworkSettingsCommandError = function (output, c
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3711,16 +3163,16 @@ export var deserializeAws_restJson1GetPortalCommand = function (output, context)
     });
 }); };
 var deserializeAws_restJson1GetPortalCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3737,46 +3189,24 @@ var deserializeAws_restJson1GetPortalCommandError = function (output, context) {
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3809,16 +3239,16 @@ export var deserializeAws_restJson1GetPortalServiceProviderMetadataCommand = fun
     });
 }); };
 var deserializeAws_restJson1GetPortalServiceProviderMetadataCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3835,46 +3265,24 @@ var deserializeAws_restJson1GetPortalServiceProviderMetadataCommandError = funct
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3903,16 +3311,16 @@ export var deserializeAws_restJson1GetTrustStoreCommand = function (output, cont
     });
 }); };
 var deserializeAws_restJson1GetTrustStoreCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3929,46 +3337,24 @@ var deserializeAws_restJson1GetTrustStoreCommandError = function (output, contex
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -4001,16 +3387,16 @@ export var deserializeAws_restJson1GetTrustStoreCertificateCommand = function (o
     });
 }); };
 var deserializeAws_restJson1GetTrustStoreCertificateCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4027,46 +3413,24 @@ var deserializeAws_restJson1GetTrustStoreCertificateCommandError = function (out
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -4095,16 +3459,16 @@ export var deserializeAws_restJson1GetUserSettingsCommand = function (output, co
     });
 }); };
 var deserializeAws_restJson1GetUserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4121,46 +3485,24 @@ var deserializeAws_restJson1GetUserSettingsCommandError = function (output, cont
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -4193,16 +3535,16 @@ export var deserializeAws_restJson1ListBrowserSettingsCommand = function (output
     });
 }); };
 var deserializeAws_restJson1ListBrowserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4217,40 +3559,22 @@ var deserializeAws_restJson1ListBrowserSettingsCommandError = function (output,
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -4283,16 +3607,16 @@ export var deserializeAws_restJson1ListIdentityProvidersCommand = function (outp
     });
 }); };
 var deserializeAws_restJson1ListIdentityProvidersCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4307,40 +3631,22 @@ var deserializeAws_restJson1ListIdentityProvidersCommandError = function (output
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -4373,16 +3679,16 @@ export var deserializeAws_restJson1ListNetworkSettingsCommand = function (output
     });
 }); };
 var deserializeAws_restJson1ListNetworkSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4397,40 +3703,22 @@ var deserializeAws_restJson1ListNetworkSettingsCommandError = function (output,
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -4463,16 +3751,16 @@ export var deserializeAws_restJson1ListPortalsCommand = function (output, contex
     });
 }); };
 var deserializeAws_restJson1ListPortalsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4487,40 +3775,22 @@ var deserializeAws_restJson1ListPortalsCommandError = function (output, context)
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -4549,16 +3819,16 @@ export var deserializeAws_restJson1ListTagsForResourceCommand = function (output
     });
 }); };
 var deserializeAws_restJson1ListTagsForResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4575,46 +3845,24 @@ var deserializeAws_restJson1ListTagsForResourceCommandError = function (output,
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -4651,16 +3899,16 @@ export var deserializeAws_restJson1ListTrustStoreCertificatesCommand = function
     });
 }); };
 var deserializeAws_restJson1ListTrustStoreCertificatesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4677,46 +3925,24 @@ var deserializeAws_restJson1ListTrustStoreCertificatesCommandError = function (o
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -4749,16 +3975,16 @@ export var deserializeAws_restJson1ListTrustStoresCommand = function (output, co
     });
 }); };
 var deserializeAws_restJson1ListTrustStoresCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4773,40 +3999,22 @@ var deserializeAws_restJson1ListTrustStoresCommandError = function (output, cont
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -4839,16 +4047,16 @@ export var deserializeAws_restJson1ListUserSettingsCommand = function (output, c
     });
 }); };
 var deserializeAws_restJson1ListUserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, parsedBody, message;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _g = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_g.body = _h.sent(), _g)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4863,40 +4071,22 @@ var deserializeAws_restJson1ListUserSettingsCommandError = function (output, con
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _h.label = 11;
-            case 11:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -4919,16 +4109,16 @@ export var deserializeAws_restJson1TagResourceCommand = function (output, contex
     });
 }); };
 var deserializeAws_restJson1TagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -4947,52 +4137,26 @@ var deserializeAws_restJson1TagResourceCommandError = function (output, context)
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1TooManyTagsExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1TooManyTagsExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -5015,16 +4179,16 @@ export var deserializeAws_restJson1UntagResourceCommand = function (output, cont
     });
 }); };
 var deserializeAws_restJson1UntagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -5041,46 +4205,24 @@ var deserializeAws_restJson1UntagResourceCommandError = function (output, contex
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -5109,16 +4251,16 @@ export var deserializeAws_restJson1UpdateBrowserSettingsCommand = function (outp
     });
 }); };
 var deserializeAws_restJson1UpdateBrowserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -5135,46 +4277,24 @@ var deserializeAws_restJson1UpdateBrowserSettingsCommandError = function (output
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -5203,16 +4323,16 @@ export var deserializeAws_restJson1UpdateIdentityProviderCommand = function (out
     });
 }); };
 var deserializeAws_restJson1UpdateIdentityProviderCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -5229,46 +4349,24 @@ var deserializeAws_restJson1UpdateIdentityProviderCommandError = function (outpu
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -5297,16 +4395,16 @@ export var deserializeAws_restJson1UpdateNetworkSettingsCommand = function (outp
     });
 }); };
 var deserializeAws_restJson1UpdateNetworkSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -5323,46 +4421,24 @@ var deserializeAws_restJson1UpdateNetworkSettingsCommandError = function (output
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -5391,16 +4467,16 @@ export var deserializeAws_restJson1UpdatePortalCommand = function (output, conte
     });
 }); };
 var deserializeAws_restJson1UpdatePortalCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -5417,46 +4493,24 @@ var deserializeAws_restJson1UpdatePortalCommandError = function (output, context
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -5485,16 +4539,16 @@ export var deserializeAws_restJson1UpdateTrustStoreCommand = function (output, c
     });
 }); };
 var deserializeAws_restJson1UpdateTrustStoreCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, parsedBody, message;
-    var _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _j = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_j.body = _k.sent(), _j)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -5513,52 +4567,26 @@ var deserializeAws_restJson1UpdateTrustStoreCommandError = function (output, con
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_k.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 15];
+            case 2: return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _k.label = 15;
-            case 15:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -5587,16 +4615,16 @@ export var deserializeAws_restJson1UpdateUserSettingsCommand = function (output,
     });
 }); };
 var deserializeAws_restJson1UpdateUserSettingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, parsedBody, message;
-    var _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _h = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_h.body = _j.sent(), _h)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -5613,76 +4641,43 @@ var deserializeAws_restJson1UpdateUserSettingsCommandError = function (output, c
                     case "com.amazonaws.workspacesweb#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessDeniedExceptionResponse(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_restJson1InternalServerExceptionResponse(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_restJson1ResourceNotFoundExceptionResponse(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_restJson1ThrottlingExceptionResponse(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_restJson1ValidationExceptionResponse(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_restJson1AccessDeniedExceptionResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _j.label = 13;
-            case 13:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
 var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "AccessDeniedException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.message !== undefined && data.message !== null) {
             contents.message = __expectString(data.message);
         }
-        return [2, contents];
+        exception = new AccessDeniedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "ConflictException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            message: undefined,
-            resourceId: undefined,
-            resourceType: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.message !== undefined && data.message !== null) {
             contents.message = __expectString(data.message);
@@ -5693,19 +4688,14 @@ var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput,
         if (data.resourceType !== undefined && data.resourceType !== null) {
             contents.resourceType = __expectString(data.resourceType);
         }
-        return [2, contents];
+        exception = new ConflictException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1InternalServerExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "InternalServerException",
-            $fault: "server",
-            $metadata: deserializeMetadata(parsedOutput),
-            message: undefined,
-            retryAfterSeconds: undefined,
-        };
+        contents = {};
         if (parsedOutput.headers["retry-after"] !== undefined) {
             contents.retryAfterSeconds = __strictParseInt32(parsedOutput.headers["retry-after"]);
         }
@@ -5713,20 +4703,14 @@ var deserializeAws_restJson1InternalServerExceptionResponse = function (parsedOu
         if (data.message !== undefined && data.message !== null) {
             contents.message = __expectString(data.message);
         }
-        return [2, contents];
+        exception = new InternalServerException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "ResourceNotFoundException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            message: undefined,
-            resourceId: undefined,
-            resourceType: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.message !== undefined && data.message !== null) {
             contents.message = __expectString(data.message);
@@ -5737,22 +4721,14 @@ var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsed
         if (data.resourceType !== undefined && data.resourceType !== null) {
             contents.resourceType = __expectString(data.resourceType);
         }
-        return [2, contents];
+        exception = new ResourceNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "ServiceQuotaExceededException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            message: undefined,
-            quotaCode: undefined,
-            resourceId: undefined,
-            resourceType: undefined,
-            serviceCode: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.message !== undefined && data.message !== null) {
             contents.message = __expectString(data.message);
@@ -5769,21 +4745,14 @@ var deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = function (pa
         if (data.serviceCode !== undefined && data.serviceCode !== null) {
             contents.serviceCode = __expectString(data.serviceCode);
         }
-        return [2, contents];
+        exception = new ServiceQuotaExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1ThrottlingExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "ThrottlingException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            message: undefined,
-            quotaCode: undefined,
-            retryAfterSeconds: undefined,
-            serviceCode: undefined,
-        };
+        contents = {};
         if (parsedOutput.headers["retry-after"] !== undefined) {
             contents.retryAfterSeconds = __strictParseInt32(parsedOutput.headers["retry-after"]);
         }
@@ -5797,19 +4766,14 @@ var deserializeAws_restJson1ThrottlingExceptionResponse = function (parsedOutput
         if (data.serviceCode !== undefined && data.serviceCode !== null) {
             contents.serviceCode = __expectString(data.serviceCode);
         }
-        return [2, contents];
+        exception = new ThrottlingException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1TooManyTagsExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "TooManyTagsException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            message: undefined,
-            resourceName: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.message !== undefined && data.message !== null) {
             contents.message = __expectString(data.message);
@@ -5817,20 +4781,14 @@ var deserializeAws_restJson1TooManyTagsExceptionResponse = function (parsedOutpu
         if (data.resourceName !== undefined && data.resourceName !== null) {
             contents.resourceName = __expectString(data.resourceName);
         }
-        return [2, contents];
+        exception = new TooManyTagsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1ValidationExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
+    var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {
-            name: "ValidationException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            fieldList: undefined,
-            message: undefined,
-            reason: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.fieldList !== undefined && data.fieldList !== null) {
             contents.fieldList = deserializeAws_restJson1ValidationExceptionFieldList(data.fieldList, context);
@@ -5841,7 +4799,8 @@ var deserializeAws_restJson1ValidationExceptionResponse = function (parsedOutput
         if (data.reason !== undefined && data.reason !== null) {
             contents.reason = __expectString(data.reason);
         }
-        return [2, contents];
+        exception = new ValidationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var serializeAws_restJson1CertificateList = function (input, context) {
@@ -5918,7 +4877,7 @@ var serializeAws_restJson1TagList = function (input, context) {
     });
 };
 var deserializeAws_restJson1ArnList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5926,6 +4885,7 @@ var deserializeAws_restJson1ArnList = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_restJson1BrowserSettings = function (output, context) {
     return {
@@ -5937,7 +4897,7 @@ var deserializeAws_restJson1BrowserSettings = function (output, context) {
     };
 };
 var deserializeAws_restJson1BrowserSettingsList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5945,6 +4905,7 @@ var deserializeAws_restJson1BrowserSettingsList = function (output, context) {
         }
         return deserializeAws_restJson1BrowserSettingsSummary(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1BrowserSettingsSummary = function (output, context) {
     return {
@@ -5979,7 +4940,7 @@ var deserializeAws_restJson1CertificateSummary = function (output, context) {
     };
 };
 var deserializeAws_restJson1CertificateSummaryList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -5987,6 +4948,7 @@ var deserializeAws_restJson1CertificateSummaryList = function (output, context)
         }
         return deserializeAws_restJson1CertificateSummary(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1IdentityProvider = function (output, context) {
     return {
@@ -6009,7 +4971,7 @@ var deserializeAws_restJson1IdentityProviderDetails = function (output, context)
     }, {});
 };
 var deserializeAws_restJson1IdentityProviderList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6017,6 +4979,7 @@ var deserializeAws_restJson1IdentityProviderList = function (output, context) {
         }
         return deserializeAws_restJson1IdentityProviderSummary(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1IdentityProviderSummary = function (output, context) {
     return {
@@ -6041,7 +5004,7 @@ var deserializeAws_restJson1NetworkSettings = function (output, context) {
     };
 };
 var deserializeAws_restJson1NetworkSettingsList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6049,6 +5012,7 @@ var deserializeAws_restJson1NetworkSettingsList = function (output, context) {
         }
         return deserializeAws_restJson1NetworkSettingsSummary(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1NetworkSettingsSummary = function (output, context) {
     return {
@@ -6075,7 +5039,7 @@ var deserializeAws_restJson1Portal = function (output, context) {
     };
 };
 var deserializeAws_restJson1PortalList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6083,6 +5047,7 @@ var deserializeAws_restJson1PortalList = function (output, context) {
         }
         return deserializeAws_restJson1PortalSummary(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1PortalSummary = function (output, context) {
     return {
@@ -6102,7 +5067,7 @@ var deserializeAws_restJson1PortalSummary = function (output, context) {
     };
 };
 var deserializeAws_restJson1SecurityGroupIdList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6110,9 +5075,10 @@ var deserializeAws_restJson1SecurityGroupIdList = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_restJson1SubnetIdList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6120,6 +5086,7 @@ var deserializeAws_restJson1SubnetIdList = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_restJson1Tag = function (output, context) {
     return {
@@ -6128,7 +5095,7 @@ var deserializeAws_restJson1Tag = function (output, context) {
     };
 };
 var deserializeAws_restJson1TagList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6136,6 +5103,7 @@ var deserializeAws_restJson1TagList = function (output, context) {
         }
         return deserializeAws_restJson1Tag(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1TrustStore = function (output, context) {
     return {
@@ -6151,7 +5119,7 @@ var deserializeAws_restJson1TrustStoreSummary = function (output, context) {
     };
 };
 var deserializeAws_restJson1TrustStoreSummaryList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6159,6 +5127,7 @@ var deserializeAws_restJson1TrustStoreSummaryList = function (output, context) {
         }
         return deserializeAws_restJson1TrustStoreSummary(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1UserSettings = function (output, context) {
     return {
@@ -6174,7 +5143,7 @@ var deserializeAws_restJson1UserSettings = function (output, context) {
     };
 };
 var deserializeAws_restJson1UserSettingsList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6182,6 +5151,7 @@ var deserializeAws_restJson1UserSettingsList = function (output, context) {
         }
         return deserializeAws_restJson1UserSettingsSummary(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1UserSettingsSummary = function (output, context) {
     return {
@@ -6200,7 +5170,7 @@ var deserializeAws_restJson1ValidationExceptionField = function (output, context
     };
 };
 var deserializeAws_restJson1ValidationExceptionFieldList = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -6208,6 +5178,7 @@ var deserializeAws_restJson1ValidationExceptionFieldList = function (output, con
         }
         return deserializeAws_restJson1ValidationExceptionField(entry, context);
     });
+    return retVal;
 };
 var deserializeMetadata = function (output) {
     var _a;