@aws-sdk/client-efs 3.52.0 → 3.53.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,7 +1,9 @@
 import { __assign, __awaiter, __generator } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, limitedParseDouble as __limitedParseDouble, parseEpochTimestamp as __parseEpochTimestamp, serializeFloat as __serializeFloat, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, limitedParseDouble as __limitedParseDouble, parseEpochTimestamp as __parseEpochTimestamp, serializeFloat as __serializeFloat, } from "@aws-sdk/smithy-client";
 import { v4 as generateIdempotencyToken } from "uuid";
+import { EFSServiceException as __BaseException } from "../models/EFSServiceException";
+import { AccessPointAlreadyExists, AccessPointLimitExceeded, AccessPointNotFound, AvailabilityZonesMismatch, BadRequest, DependencyTimeout, FileSystemAlreadyExists, FileSystemInUse, FileSystemLimitExceeded, FileSystemNotFound, IncorrectFileSystemLifeCycleState, IncorrectMountTargetState, InsufficientThroughputCapacity, InternalServerError, InvalidPolicyException, IpAddressInUse, MountTargetConflict, MountTargetNotFound, NetworkInterfaceLimitExceeded, NoFreeAddressesInSubnet, PolicyNotFound, ReplicationNotFound, SecurityGroupLimitExceeded, SecurityGroupNotFound, SubnetNotFound, ThroughputLimitExceeded, TooManyRequests, UnsupportedAvailabilityZone, ValidationException, } from "../models/models_0";
 export var serializeAws_restJson1CreateAccessPointCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     var _c;
@@ -1005,16 +1007,16 @@ export var deserializeAws_restJson1CreateAccessPointCommand = function (output,
     });
 }); };
 var deserializeAws_restJson1CreateAccessPointCommandError = 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;
@@ -1033,52 +1035,26 @@ var deserializeAws_restJson1CreateAccessPointCommandError = function (output, co
                     case "com.amazonaws.efs#InternalServerError": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessPointAlreadyExistsResponse(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_restJson1AccessPointLimitExceededResponse(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_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1IncorrectFileSystemLifeCycleStateResponse(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_restJson1InternalServerErrorResponse(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_restJson1AccessPointAlreadyExistsResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1AccessPointLimitExceededResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1IncorrectFileSystemLifeCycleStateResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1InternalServerErrorResponse(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);
         }
     });
 }); };
@@ -1171,16 +1147,16 @@ export var deserializeAws_restJson1CreateFileSystemCommand = function (output, c
     });
 }); };
 var deserializeAws_restJson1CreateFileSystemCommandError = 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;
@@ -1201,58 +1177,28 @@ var deserializeAws_restJson1CreateFileSystemCommandError = function (output, con
                     case "com.amazonaws.efs#UnsupportedAvailabilityZone": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1FileSystemAlreadyExistsResponse(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_restJson1FileSystemLimitExceededResponse(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_restJson1InsufficientThroughputCapacityResponse(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_restJson1InternalServerErrorResponse(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_restJson1ThroughputLimitExceededResponse(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_restJson1UnsupportedAvailabilityZoneResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemAlreadyExistsResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1FileSystemLimitExceededResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1InsufficientThroughputCapacityResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ThroughputLimitExceededResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_restJson1UnsupportedAvailabilityZoneResponse(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);
         }
     });
 }); };
@@ -1317,16 +1263,16 @@ export var deserializeAws_restJson1CreateMountTargetCommand = function (output,
     });
 }); };
 var deserializeAws_restJson1CreateMountTargetCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, parsedBody, message;
-    var _r;
-    return __generator(this, function (_s) {
-        switch (_s.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _r = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_r.body = _s.sent(), _r)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1359,94 +1305,40 @@ var deserializeAws_restJson1CreateMountTargetCommandError = function (output, co
                     case "com.amazonaws.efs#UnsupportedAvailabilityZone": return [3, 26];
                 }
                 return [3, 28];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AvailabilityZonesMismatchResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1IncorrectFileSystemLifeCycleStateResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1IpAddressInUseResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_restJson1MountTargetConflictResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_restJson1NetworkInterfaceLimitExceededResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_restJson1NoFreeAddressesInSubnetResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_restJson1SecurityGroupLimitExceededResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
-            case 22:
-                _o = [{}];
-                return [4, deserializeAws_restJson1SecurityGroupNotFoundResponse(parsedOutput, context)];
-            case 23:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _o.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
-            case 24:
-                _p = [{}];
-                return [4, deserializeAws_restJson1SubnetNotFoundResponse(parsedOutput, context)];
-            case 25:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _p.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
-            case 26:
-                _q = [{}];
-                return [4, deserializeAws_restJson1UnsupportedAvailabilityZoneResponse(parsedOutput, context)];
-            case 27:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _q.concat([(_s.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 29];
+            case 2: return [4, deserializeAws_restJson1AvailabilityZonesMismatchResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1IncorrectFileSystemLifeCycleStateResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1IpAddressInUseResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_restJson1MountTargetConflictResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_restJson1NetworkInterfaceLimitExceededResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_restJson1NoFreeAddressesInSubnetResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_restJson1SecurityGroupLimitExceededResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
+            case 22: return [4, deserializeAws_restJson1SecurityGroupNotFoundResponse(parsedOutput, context)];
+            case 23: throw _d.sent();
+            case 24: return [4, deserializeAws_restJson1SubnetNotFoundResponse(parsedOutput, context)];
+            case 25: throw _d.sent();
+            case 26: return [4, deserializeAws_restJson1UnsupportedAvailabilityZoneResponse(parsedOutput, context)];
+            case 27: throw _d.sent();
             case 28:
                 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) });
-                _s.label = 29;
-            case 29:
-                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);
         }
     });
 }); };
@@ -1495,16 +1387,16 @@ export var deserializeAws_restJson1CreateReplicationConfigurationCommand = funct
     });
 }); };
 var deserializeAws_restJson1CreateReplicationConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, parsedBody, message;
-    var _o;
-    return __generator(this, function (_p) {
-        switch (_p.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _o = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_o.body = _p.sent(), _o)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1531,76 +1423,34 @@ var deserializeAws_restJson1CreateReplicationConfigurationCommandError = functio
                     case "com.amazonaws.efs#ValidationException": return [3, 20];
                 }
                 return [3, 22];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1FileSystemLimitExceededResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 8:
-                _f = [{}];
-                return [4, deserializeAws_restJson1IncorrectFileSystemLifeCycleStateResponse(parsedOutput, context)];
-            case 9:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 10:
-                _g = [{}];
-                return [4, deserializeAws_restJson1InsufficientThroughputCapacityResponse(parsedOutput, context)];
-            case 11:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 12:
-                _h = [{}];
-                return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
-            case 13:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _h.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 14:
-                _j = [{}];
-                return [4, deserializeAws_restJson1ReplicationNotFoundResponse(parsedOutput, context)];
-            case 15:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 16:
-                _k = [{}];
-                return [4, deserializeAws_restJson1ThroughputLimitExceededResponse(parsedOutput, context)];
-            case 17:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _k.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 18:
-                _l = [{}];
-                return [4, deserializeAws_restJson1UnsupportedAvailabilityZoneResponse(parsedOutput, context)];
-            case 19:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _l.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
-            case 20:
-                _m = [{}];
-                return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
-            case 21:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _m.concat([(_p.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 23];
+            case 2: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemLimitExceededResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1IncorrectFileSystemLifeCycleStateResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1InsufficientThroughputCapacityResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_restJson1ReplicationNotFoundResponse(parsedOutput, context)];
+            case 15: throw _d.sent();
+            case 16: return [4, deserializeAws_restJson1ThroughputLimitExceededResponse(parsedOutput, context)];
+            case 17: throw _d.sent();
+            case 18: return [4, deserializeAws_restJson1UnsupportedAvailabilityZoneResponse(parsedOutput, context)];
+            case 19: throw _d.sent();
+            case 20: return [4, deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)];
+            case 21: throw _d.sent();
             case 22:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _p.label = 23;
-            case 23:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1623,16 +1473,16 @@ export var deserializeAws_restJson1CreateTagsCommand = function (output, context
     });
 }); };
 var deserializeAws_restJson1CreateTagsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1645,34 +1495,20 @@ var deserializeAws_restJson1CreateTagsCommandError = function (output, context)
                     case "com.amazonaws.efs#InternalServerError": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1695,16 +1531,16 @@ export var deserializeAws_restJson1DeleteAccessPointCommand = function (output,
     });
 }); };
 var deserializeAws_restJson1DeleteAccessPointCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -1717,34 +1553,20 @@ var deserializeAws_restJson1DeleteAccessPointCommandError = function (output, co
                     case "com.amazonaws.efs#InternalServerError": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessPointNotFoundResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_restJson1AccessPointNotFoundResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -1767,16 +1589,16 @@ export var deserializeAws_restJson1DeleteFileSystemCommand = function (output, c
     });
 }); };
 var deserializeAws_restJson1DeleteFileSystemCommandError = 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;
@@ -1791,40 +1613,22 @@ var deserializeAws_restJson1DeleteFileSystemCommandError = function (output, con
                     case "com.amazonaws.efs#InternalServerError": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1FileSystemInUseResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1InternalServerErrorResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemInUseResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1InternalServerErrorResponse(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);
         }
     });
 }); };
@@ -1847,16 +1651,16 @@ export var deserializeAws_restJson1DeleteFileSystemPolicyCommand = function (out
     });
 }); };
 var deserializeAws_restJson1DeleteFileSystemPolicyCommandError = 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;
@@ -1871,40 +1675,22 @@ var deserializeAws_restJson1DeleteFileSystemPolicyCommandError = function (outpu
                     case "com.amazonaws.efs#InternalServerError": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1IncorrectFileSystemLifeCycleStateResponse(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_restJson1InternalServerErrorResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1IncorrectFileSystemLifeCycleStateResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1InternalServerErrorResponse(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);
         }
     });
 }); };
@@ -1927,16 +1713,16 @@ export var deserializeAws_restJson1DeleteMountTargetCommand = function (output,
     });
 }); };
 var deserializeAws_restJson1DeleteMountTargetCommandError = 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;
@@ -1951,40 +1737,22 @@ var deserializeAws_restJson1DeleteMountTargetCommandError = function (output, co
                     case "com.amazonaws.efs#MountTargetNotFound": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1DependencyTimeoutResponse(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_restJson1InternalServerErrorResponse(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_restJson1MountTargetNotFoundResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1DependencyTimeoutResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1MountTargetNotFoundResponse(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);
         }
     });
 }); };
@@ -2007,16 +1775,16 @@ export var deserializeAws_restJson1DeleteReplicationConfigurationCommand = funct
     });
 }); };
 var deserializeAws_restJson1DeleteReplicationConfigurationCommandError = 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;
@@ -2031,40 +1799,22 @@ var deserializeAws_restJson1DeleteReplicationConfigurationCommandError = functio
                     case "com.amazonaws.efs#ReplicationNotFound": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1InternalServerErrorResponse(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_restJson1ReplicationNotFoundResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ReplicationNotFoundResponse(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);
         }
     });
 }); };
@@ -2087,16 +1837,16 @@ export var deserializeAws_restJson1DeleteTagsCommand = function (output, context
     });
 }); };
 var deserializeAws_restJson1DeleteTagsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2109,34 +1859,20 @@ var deserializeAws_restJson1DeleteTagsCommandError = function (output, context)
                     case "com.amazonaws.efs#InternalServerError": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2169,16 +1905,16 @@ export var deserializeAws_restJson1DescribeAccessPointsCommand = function (outpu
     });
 }); };
 var deserializeAws_restJson1DescribeAccessPointsCommandError = 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;
@@ -2193,40 +1929,22 @@ var deserializeAws_restJson1DescribeAccessPointsCommandError = function (output,
                     case "com.amazonaws.efs#InternalServerError": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessPointNotFoundResponse(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_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1InternalServerErrorResponse(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_restJson1AccessPointNotFoundResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1InternalServerErrorResponse(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);
         }
     });
 }); };
@@ -2259,16 +1977,16 @@ export var deserializeAws_restJson1DescribeAccountPreferencesCommand = function
     });
 }); };
 var deserializeAws_restJson1DescribeAccountPreferencesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, parsedBody, message;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _d = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_d.body = _e.sent(), _d)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2277,22 +1995,16 @@ var deserializeAws_restJson1DescribeAccountPreferencesCommandError = function (o
                     case "com.amazonaws.efs#InternalServerError": return [3, 2];
                 }
                 return [3, 4];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_e.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 5];
+            case 2: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
             case 4:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _e.label = 5;
-            case 5:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2321,16 +2033,16 @@ export var deserializeAws_restJson1DescribeBackupPolicyCommand = function (outpu
     });
 }); };
 var deserializeAws_restJson1DescribeBackupPolicyCommandError = 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;
@@ -2347,46 +2059,24 @@ var deserializeAws_restJson1DescribeBackupPolicyCommandError = function (output,
                     case "com.amazonaws.efs#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1InternalServerErrorResponse(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_restJson1PolicyNotFoundResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1PolicyNotFoundResponse(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);
         }
     });
 }); };
@@ -2419,16 +2109,16 @@ export var deserializeAws_restJson1DescribeFileSystemPolicyCommand = function (o
     });
 }); };
 var deserializeAws_restJson1DescribeFileSystemPolicyCommandError = 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;
@@ -2443,40 +2133,22 @@ var deserializeAws_restJson1DescribeFileSystemPolicyCommandError = function (out
                     case "com.amazonaws.efs#PolicyNotFound": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1InternalServerErrorResponse(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_restJson1PolicyNotFoundResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1PolicyNotFoundResponse(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);
         }
     });
 }); };
@@ -2513,16 +2185,16 @@ export var deserializeAws_restJson1DescribeFileSystemsCommand = function (output
     });
 }); };
 var deserializeAws_restJson1DescribeFileSystemsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2535,34 +2207,20 @@ var deserializeAws_restJson1DescribeFileSystemsCommandError = function (output,
                     case "com.amazonaws.efs#InternalServerError": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2591,16 +2249,16 @@ export var deserializeAws_restJson1DescribeLifecycleConfigurationCommand = funct
     });
 }); };
 var deserializeAws_restJson1DescribeLifecycleConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2613,34 +2271,20 @@ var deserializeAws_restJson1DescribeLifecycleConfigurationCommandError = functio
                     case "com.amazonaws.efs#InternalServerError": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -2677,16 +2321,16 @@ export var deserializeAws_restJson1DescribeMountTargetsCommand = function (outpu
     });
 }); };
 var deserializeAws_restJson1DescribeMountTargetsCommandError = 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;
@@ -2703,46 +2347,24 @@ var deserializeAws_restJson1DescribeMountTargetsCommandError = function (output,
                     case "com.amazonaws.efs#MountTargetNotFound": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessPointNotFoundResponse(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_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1InternalServerErrorResponse(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_restJson1MountTargetNotFoundResponse(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_restJson1AccessPointNotFoundResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1MountTargetNotFoundResponse(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);
         }
     });
 }); };
@@ -2771,16 +2393,16 @@ export var deserializeAws_restJson1DescribeMountTargetSecurityGroupsCommand = fu
     });
 }); };
 var deserializeAws_restJson1DescribeMountTargetSecurityGroupsCommandError = 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;
@@ -2795,40 +2417,22 @@ var deserializeAws_restJson1DescribeMountTargetSecurityGroupsCommandError = func
                     case "com.amazonaws.efs#MountTargetNotFound": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1IncorrectMountTargetStateResponse(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_restJson1InternalServerErrorResponse(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_restJson1MountTargetNotFoundResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1IncorrectMountTargetStateResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1MountTargetNotFoundResponse(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);
         }
     });
 }); };
@@ -2861,16 +2465,16 @@ export var deserializeAws_restJson1DescribeReplicationConfigurationsCommand = fu
     });
 }); };
 var deserializeAws_restJson1DescribeReplicationConfigurationsCommandError = 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;
@@ -2887,46 +2491,24 @@ var deserializeAws_restJson1DescribeReplicationConfigurationsCommandError = func
                     case "com.amazonaws.efs#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1InternalServerErrorResponse(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_restJson1ReplicationNotFoundResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1ReplicationNotFoundResponse(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);
         }
     });
 }); };
@@ -2963,16 +2545,16 @@ export var deserializeAws_restJson1DescribeTagsCommand = function (output, conte
     });
 }); };
 var deserializeAws_restJson1DescribeTagsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, _e, parsedBody, message;
-    var _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _f = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_f.body = _g.sent(), _f)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -2985,34 +2567,20 @@ var deserializeAws_restJson1DescribeTagsCommandError = function (output, context
                     case "com.amazonaws.efs#InternalServerError": return [3, 6];
                 }
                 return [3, 8];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
-            case 6:
-                _e = [{}];
-                return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
-            case 7:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 9];
+            case 2: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _g.label = 9;
-            case 9:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3045,16 +2613,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, 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;
@@ -3069,40 +2637,22 @@ var deserializeAws_restJson1ListTagsForResourceCommandError = function (output,
                     case "com.amazonaws.efs#InternalServerError": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessPointNotFoundResponse(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_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1InternalServerErrorResponse(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_restJson1AccessPointNotFoundResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1InternalServerErrorResponse(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);
         }
     });
 }); };
@@ -3125,16 +2675,16 @@ export var deserializeAws_restJson1ModifyMountTargetSecurityGroupsCommand = func
     });
 }); };
 var deserializeAws_restJson1ModifyMountTargetSecurityGroupsCommandError = 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;
@@ -3153,52 +2703,26 @@ var deserializeAws_restJson1ModifyMountTargetSecurityGroupsCommandError = functi
                     case "com.amazonaws.efs#SecurityGroupNotFound": return [3, 12];
                 }
                 return [3, 14];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1IncorrectMountTargetStateResponse(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_restJson1InternalServerErrorResponse(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_restJson1MountTargetNotFoundResponse(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_restJson1SecurityGroupLimitExceededResponse(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_restJson1SecurityGroupNotFoundResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1IncorrectMountTargetStateResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1MountTargetNotFoundResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1SecurityGroupLimitExceededResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1SecurityGroupNotFoundResponse(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);
         }
     });
 }); };
@@ -3227,16 +2751,16 @@ export var deserializeAws_restJson1PutAccountPreferencesCommand = function (outp
     });
 }); };
 var deserializeAws_restJson1PutAccountPreferencesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, _c, _d, parsedBody, message;
-    var _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var parsedOutput, _a, response, errorCode, _b, parsedBody;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 _a = [__assign({}, output)];
-                _e = {};
+                _c = {};
                 return [4, parseBody(output.body, context)];
             case 1:
-                parsedOutput = __assign.apply(void 0, _a.concat([(_e.body = _f.sent(), _e)]));
+                parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = "UnknownError";
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
                 _b = errorCode;
@@ -3247,28 +2771,18 @@ var deserializeAws_restJson1PutAccountPreferencesCommandError = function (output
                     case "com.amazonaws.efs#InternalServerError": return [3, 4];
                 }
                 return [3, 6];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
-            case 3:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_f.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 7];
-            case 4:
-                _d = [{}];
-                return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
-            case 5:
-                response = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_f.sent())])), { name: errorCode, $metadata: deserializeMetadata(output) }]);
-                return [3, 7];
+            case 2: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
             case 6:
                 parsedBody = parsedOutput.body;
-                errorCode = parsedBody.code || parsedBody.Code || errorCode;
-                response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
-                _f.label = 7;
-            case 7:
-                message = response.message || response.Message || errorCode;
-                response.message = message;
-                delete response.Message;
-                return [2, Promise.reject(Object.assign(new Error(message), response))];
+                response = new __BaseException({
+                    name: parsedBody.code || parsedBody.Code || errorCode,
+                    $fault: "client",
+                    $metadata: deserializeMetadata(output),
+                });
+                throw __decorateServiceException(response, parsedBody);
         }
     });
 }); };
@@ -3297,16 +2811,16 @@ export var deserializeAws_restJson1PutBackupPolicyCommand = function (output, co
     });
 }); };
 var deserializeAws_restJson1PutBackupPolicyCommandError = 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;
@@ -3323,46 +2837,24 @@ var deserializeAws_restJson1PutBackupPolicyCommandError = function (output, cont
                     case "com.amazonaws.efs#ValidationException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1IncorrectFileSystemLifeCycleStateResponse(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_restJson1InternalServerErrorResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1IncorrectFileSystemLifeCycleStateResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1InternalServerErrorResponse(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);
         }
     });
 }); };
@@ -3395,16 +2887,16 @@ export var deserializeAws_restJson1PutFileSystemPolicyCommand = function (output
     });
 }); };
 var deserializeAws_restJson1PutFileSystemPolicyCommandError = 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;
@@ -3421,46 +2913,24 @@ var deserializeAws_restJson1PutFileSystemPolicyCommandError = function (output,
                     case "com.amazonaws.efs#InvalidPolicyException": return [3, 10];
                 }
                 return [3, 12];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1IncorrectFileSystemLifeCycleStateResponse(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_restJson1InternalServerErrorResponse(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_restJson1InvalidPolicyExceptionResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1IncorrectFileSystemLifeCycleStateResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1InvalidPolicyExceptionResponse(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);
         }
     });
 }); };
@@ -3489,16 +2959,16 @@ export var deserializeAws_restJson1PutLifecycleConfigurationCommand = function (
     });
 }); };
 var deserializeAws_restJson1PutLifecycleConfigurationCommandError = 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;
@@ -3513,40 +2983,22 @@ var deserializeAws_restJson1PutLifecycleConfigurationCommandError = function (ou
                     case "com.amazonaws.efs#InternalServerError": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1IncorrectFileSystemLifeCycleStateResponse(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_restJson1InternalServerErrorResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1IncorrectFileSystemLifeCycleStateResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1InternalServerErrorResponse(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);
         }
     });
 }); };
@@ -3569,16 +3021,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, 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;
@@ -3593,40 +3045,22 @@ var deserializeAws_restJson1TagResourceCommandError = function (output, context)
                     case "com.amazonaws.efs#InternalServerError": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessPointNotFoundResponse(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_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1InternalServerErrorResponse(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_restJson1AccessPointNotFoundResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1InternalServerErrorResponse(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);
         }
     });
 }); };
@@ -3649,16 +3083,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, 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;
@@ -3673,40 +3107,22 @@ var deserializeAws_restJson1UntagResourceCommandError = function (output, contex
                     case "com.amazonaws.efs#InternalServerError": return [3, 8];
                 }
                 return [3, 10];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1AccessPointNotFoundResponse(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_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1InternalServerErrorResponse(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_restJson1AccessPointNotFoundResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1BadRequestResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1InternalServerErrorResponse(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);
         }
     });
 }); };
@@ -3799,16 +3215,16 @@ export var deserializeAws_restJson1UpdateFileSystemCommand = function (output, c
     });
 }); };
 var deserializeAws_restJson1UpdateFileSystemCommandError = 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;
@@ -3829,72 +3245,35 @@ var deserializeAws_restJson1UpdateFileSystemCommandError = function (output, con
                     case "com.amazonaws.efs#TooManyRequests": return [3, 14];
                 }
                 return [3, 16];
-            case 2:
-                _c = [{}];
-                return [4, deserializeAws_restJson1BadRequestResponse(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_restJson1FileSystemNotFoundResponse(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_restJson1IncorrectFileSystemLifeCycleStateResponse(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_restJson1InsufficientThroughputCapacityResponse(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_restJson1InternalServerErrorResponse(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_restJson1ThroughputLimitExceededResponse(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_restJson1TooManyRequestsResponse(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_restJson1BadRequestResponse(parsedOutput, context)];
+            case 3: throw _d.sent();
+            case 4: return [4, deserializeAws_restJson1FileSystemNotFoundResponse(parsedOutput, context)];
+            case 5: throw _d.sent();
+            case 6: return [4, deserializeAws_restJson1IncorrectFileSystemLifeCycleStateResponse(parsedOutput, context)];
+            case 7: throw _d.sent();
+            case 8: return [4, deserializeAws_restJson1InsufficientThroughputCapacityResponse(parsedOutput, context)];
+            case 9: throw _d.sent();
+            case 10: return [4, deserializeAws_restJson1InternalServerErrorResponse(parsedOutput, context)];
+            case 11: throw _d.sent();
+            case 12: return [4, deserializeAws_restJson1ThroughputLimitExceededResponse(parsedOutput, context)];
+            case 13: throw _d.sent();
+            case 14: return [4, deserializeAws_restJson1TooManyRequestsResponse(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);
         }
     });
 }); };
 var deserializeAws_restJson1AccessPointAlreadyExistsResponse = 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: "AccessPointAlreadyExists",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            AccessPointId: undefined,
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.AccessPointId !== undefined && data.AccessPointId !== null) {
             contents.AccessPointId = __expectString(data.AccessPointId);
@@ -3905,19 +3284,14 @@ var deserializeAws_restJson1AccessPointAlreadyExistsResponse = function (parsedO
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new AccessPointAlreadyExists(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1AccessPointLimitExceededResponse = 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: "AccessPointLimitExceeded",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -3925,19 +3299,14 @@ var deserializeAws_restJson1AccessPointLimitExceededResponse = function (parsedO
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new AccessPointLimitExceeded(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1AccessPointNotFoundResponse = 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: "AccessPointNotFound",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -3945,19 +3314,14 @@ var deserializeAws_restJson1AccessPointNotFoundResponse = function (parsedOutput
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new AccessPointNotFound(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1AvailabilityZonesMismatchResponse = 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: "AvailabilityZonesMismatch",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -3965,19 +3329,14 @@ var deserializeAws_restJson1AvailabilityZonesMismatchResponse = function (parsed
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new AvailabilityZonesMismatch(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1BadRequestResponse = 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: "BadRequest",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -3985,19 +3344,14 @@ var deserializeAws_restJson1BadRequestResponse = function (parsedOutput, context
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new BadRequest(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1DependencyTimeoutResponse = 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: "DependencyTimeout",
-            $fault: "server",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4005,20 +3359,14 @@ var deserializeAws_restJson1DependencyTimeoutResponse = function (parsedOutput,
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new DependencyTimeout(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1FileSystemAlreadyExistsResponse = 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: "FileSystemAlreadyExists",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            FileSystemId: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4029,19 +3377,14 @@ var deserializeAws_restJson1FileSystemAlreadyExistsResponse = function (parsedOu
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new FileSystemAlreadyExists(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1FileSystemInUseResponse = 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: "FileSystemInUse",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4049,19 +3392,14 @@ var deserializeAws_restJson1FileSystemInUseResponse = function (parsedOutput, co
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new FileSystemInUse(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1FileSystemLimitExceededResponse = 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: "FileSystemLimitExceeded",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4069,19 +3407,14 @@ var deserializeAws_restJson1FileSystemLimitExceededResponse = function (parsedOu
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new FileSystemLimitExceeded(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1FileSystemNotFoundResponse = 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: "FileSystemNotFound",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4089,19 +3422,14 @@ var deserializeAws_restJson1FileSystemNotFoundResponse = function (parsedOutput,
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new FileSystemNotFound(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1IncorrectFileSystemLifeCycleStateResponse = 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: "IncorrectFileSystemLifeCycleState",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4109,19 +3437,14 @@ var deserializeAws_restJson1IncorrectFileSystemLifeCycleStateResponse = function
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new IncorrectFileSystemLifeCycleState(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1IncorrectMountTargetStateResponse = 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: "IncorrectMountTargetState",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4129,19 +3452,14 @@ var deserializeAws_restJson1IncorrectMountTargetStateResponse = function (parsed
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new IncorrectMountTargetState(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1InsufficientThroughputCapacityResponse = 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: "InsufficientThroughputCapacity",
-            $fault: "server",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4149,19 +3467,14 @@ var deserializeAws_restJson1InsufficientThroughputCapacityResponse = function (p
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new InsufficientThroughputCapacity(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1InternalServerErrorResponse = 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: "InternalServerError",
-            $fault: "server",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4169,19 +3482,14 @@ var deserializeAws_restJson1InternalServerErrorResponse = function (parsedOutput
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new InternalServerError(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1InvalidPolicyExceptionResponse = 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: "InvalidPolicyException",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4189,19 +3497,14 @@ var deserializeAws_restJson1InvalidPolicyExceptionResponse = function (parsedOut
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new InvalidPolicyException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1IpAddressInUseResponse = 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: "IpAddressInUse",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4209,19 +3512,14 @@ var deserializeAws_restJson1IpAddressInUseResponse = function (parsedOutput, con
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new IpAddressInUse(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1MountTargetConflictResponse = 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: "MountTargetConflict",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4229,19 +3527,14 @@ var deserializeAws_restJson1MountTargetConflictResponse = function (parsedOutput
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new MountTargetConflict(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1MountTargetNotFoundResponse = 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: "MountTargetNotFound",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4249,19 +3542,14 @@ var deserializeAws_restJson1MountTargetNotFoundResponse = function (parsedOutput
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new MountTargetNotFound(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1NetworkInterfaceLimitExceededResponse = 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: "NetworkInterfaceLimitExceeded",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4269,19 +3557,14 @@ var deserializeAws_restJson1NetworkInterfaceLimitExceededResponse = function (pa
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new NetworkInterfaceLimitExceeded(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1NoFreeAddressesInSubnetResponse = 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: "NoFreeAddressesInSubnet",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4289,19 +3572,14 @@ var deserializeAws_restJson1NoFreeAddressesInSubnetResponse = function (parsedOu
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new NoFreeAddressesInSubnet(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1PolicyNotFoundResponse = 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: "PolicyNotFound",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4309,19 +3587,14 @@ var deserializeAws_restJson1PolicyNotFoundResponse = function (parsedOutput, con
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new PolicyNotFound(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1ReplicationNotFoundResponse = 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: "ReplicationNotFound",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4329,19 +3602,14 @@ var deserializeAws_restJson1ReplicationNotFoundResponse = function (parsedOutput
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new ReplicationNotFound(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1SecurityGroupLimitExceededResponse = 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: "SecurityGroupLimitExceeded",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4349,19 +3617,14 @@ var deserializeAws_restJson1SecurityGroupLimitExceededResponse = function (parse
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new SecurityGroupLimitExceeded(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1SecurityGroupNotFoundResponse = 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: "SecurityGroupNotFound",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4369,19 +3632,14 @@ var deserializeAws_restJson1SecurityGroupNotFoundResponse = function (parsedOutp
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new SecurityGroupNotFound(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1SubnetNotFoundResponse = 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: "SubnetNotFound",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4389,19 +3647,14 @@ var deserializeAws_restJson1SubnetNotFoundResponse = function (parsedOutput, con
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new SubnetNotFound(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1ThroughputLimitExceededResponse = 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: "ThroughputLimitExceeded",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4409,19 +3662,14 @@ var deserializeAws_restJson1ThroughputLimitExceededResponse = function (parsedOu
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new ThroughputLimitExceeded(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1TooManyRequestsResponse = 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: "TooManyRequests",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4429,19 +3677,14 @@ var deserializeAws_restJson1TooManyRequestsResponse = function (parsedOutput, co
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new TooManyRequests(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var deserializeAws_restJson1UnsupportedAvailabilityZoneResponse = 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: "UnsupportedAvailabilityZone",
-            $fault: "client",
-            $metadata: deserializeMetadata(parsedOutput),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4449,19 +3692,14 @@ var deserializeAws_restJson1UnsupportedAvailabilityZoneResponse = function (pars
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new UnsupportedAvailabilityZone(__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),
-            ErrorCode: undefined,
-            Message: undefined,
-        };
+        contents = {};
         data = parsedOutput.body;
         if (data.ErrorCode !== undefined && data.ErrorCode !== null) {
             contents.ErrorCode = __expectString(data.ErrorCode);
@@ -4469,7 +3707,8 @@ var deserializeAws_restJson1ValidationExceptionResponse = function (parsedOutput
         if (data.Message !== undefined && data.Message !== null) {
             contents.Message = __expectString(data.Message);
         }
-        return [2, contents];
+        exception = new ValidationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
+        return [2, __decorateServiceException(exception, parsedOutput.body)];
     });
 }); };
 var serializeAws_restJson1BackupPolicy = function (input, context) {
@@ -4583,7 +3822,7 @@ var deserializeAws_restJson1AccessPointDescription = function (output, context)
     };
 };
 var deserializeAws_restJson1AccessPointDescriptions = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4591,6 +3830,7 @@ var deserializeAws_restJson1AccessPointDescriptions = function (output, context)
         }
         return deserializeAws_restJson1AccessPointDescription(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1BackupPolicy = function (output, context) {
     return {
@@ -4615,7 +3855,7 @@ var deserializeAws_restJson1Destination = function (output, context) {
     };
 };
 var deserializeAws_restJson1Destinations = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4623,6 +3863,7 @@ var deserializeAws_restJson1Destinations = function (output, context) {
         }
         return deserializeAws_restJson1Destination(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1FileSystemDescription = function (output, context) {
     return {
@@ -4652,7 +3893,7 @@ var deserializeAws_restJson1FileSystemDescription = function (output, context) {
     };
 };
 var deserializeAws_restJson1FileSystemDescriptions = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4660,6 +3901,7 @@ var deserializeAws_restJson1FileSystemDescriptions = function (output, context)
         }
         return deserializeAws_restJson1FileSystemDescription(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1FileSystemSize = function (output, context) {
     return {
@@ -4672,7 +3914,7 @@ var deserializeAws_restJson1FileSystemSize = function (output, context) {
     };
 };
 var deserializeAws_restJson1LifecyclePolicies = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4680,6 +3922,7 @@ var deserializeAws_restJson1LifecyclePolicies = function (output, context) {
         }
         return deserializeAws_restJson1LifecyclePolicy(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1LifecyclePolicy = function (output, context) {
     return {
@@ -4702,7 +3945,7 @@ var deserializeAws_restJson1MountTargetDescription = function (output, context)
     };
 };
 var deserializeAws_restJson1MountTargetDescriptions = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4710,6 +3953,7 @@ var deserializeAws_restJson1MountTargetDescriptions = function (output, context)
         }
         return deserializeAws_restJson1MountTargetDescription(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1PosixUser = function (output, context) {
     return {
@@ -4735,7 +3979,7 @@ var deserializeAws_restJson1ReplicationConfigurationDescription = function (outp
     };
 };
 var deserializeAws_restJson1ReplicationConfigurationDescriptions = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4743,6 +3987,7 @@ var deserializeAws_restJson1ReplicationConfigurationDescriptions = function (out
         }
         return deserializeAws_restJson1ReplicationConfigurationDescription(entry, context);
     });
+    return retVal;
 };
 var deserializeAws_restJson1ResourceIdPreference = function (output, context) {
     return {
@@ -4753,7 +3998,7 @@ var deserializeAws_restJson1ResourceIdPreference = function (output, context) {
     };
 };
 var deserializeAws_restJson1Resources = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4761,6 +4006,7 @@ var deserializeAws_restJson1Resources = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_restJson1RootDirectory = function (output, context) {
     return {
@@ -4771,7 +4017,7 @@ var deserializeAws_restJson1RootDirectory = function (output, context) {
     };
 };
 var deserializeAws_restJson1SecondaryGids = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4779,9 +4025,10 @@ var deserializeAws_restJson1SecondaryGids = function (output, context) {
         }
         return __expectLong(entry);
     });
+    return retVal;
 };
 var deserializeAws_restJson1SecurityGroups = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4789,6 +4036,7 @@ var deserializeAws_restJson1SecurityGroups = function (output, context) {
         }
         return __expectString(entry);
     });
+    return retVal;
 };
 var deserializeAws_restJson1Tag = function (output, context) {
     return {
@@ -4797,7 +4045,7 @@ var deserializeAws_restJson1Tag = function (output, context) {
     };
 };
 var deserializeAws_restJson1Tags = function (output, context) {
-    return (output || [])
+    var retVal = (output || [])
         .filter(function (e) { return e != null; })
         .map(function (entry) {
         if (entry === null) {
@@ -4805,6 +4053,7 @@ var deserializeAws_restJson1Tags = function (output, context) {
         }
         return deserializeAws_restJson1Tag(entry, context);
     });
+    return retVal;
 };
 var deserializeMetadata = function (output) {
     var _a;