@aws-sdk/client-greengrassv2 3.52.0 → 3.54.1

package/dist-cjs/protocols/Aws_restJson1.js

@@ -5,6 +5,8 @@ exports.deserializeAws_restJson1UpdateConnectivityInfoCommand = exports.deserial
 const protocol_http_1 = require("@aws-sdk/protocol-http");
 const smithy_client_1 = require("@aws-sdk/smithy-client");
 const uuid_1 = require("uuid");
+const GreengrassV2ServiceException_1 = require("../models/GreengrassV2ServiceException");
+const models_0_1 = require("../models/models_0");
 const serializeAws_restJson1AssociateServiceRoleToAccountCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {
@@ -826,35 +828,19 @@ const deserializeAws_restJson1AssociateServiceRoleToAccountCommandError = async
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1BatchAssociateClientDeviceWithCoreDeviceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -882,59 +868,28 @@ const deserializeAws_restJson1BatchAssociateClientDeviceWithCoreDeviceCommandErr
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1BatchDisassociateClientDeviceFromCoreDeviceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -962,59 +917,28 @@ const deserializeAws_restJson1BatchDisassociateClientDeviceFromCoreDeviceCommand
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1CancelDeploymentCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1042,67 +966,31 @@ const deserializeAws_restJson1CancelDeploymentCommandError = async (output, cont
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.greengrassv2#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1CreateComponentVersionCommand = async (output, context) => {
     if (output.statusCode !== 201 && output.statusCode >= 300) {
@@ -1146,75 +1034,34 @@ const deserializeAws_restJson1CreateComponentVersionCommandError = async (output
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.greengrassv2#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "RequestAlreadyInProgressException":
         case "com.amazonaws.greengrassv2#RequestAlreadyInProgressException":
-            response = {
-                ...(await deserializeAws_restJson1RequestAlreadyInProgressExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1RequestAlreadyInProgressExceptionResponse(parsedOutput, context);
         case "ServiceQuotaExceededException":
         case "com.amazonaws.greengrassv2#ServiceQuotaExceededException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1CreateDeploymentCommand = async (output, context) => {
     if (output.statusCode !== 201 && output.statusCode >= 300) {
@@ -1250,67 +1097,31 @@ const deserializeAws_restJson1CreateDeploymentCommandError = async (output, cont
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "RequestAlreadyInProgressException":
         case "com.amazonaws.greengrassv2#RequestAlreadyInProgressException":
-            response = {
-                ...(await deserializeAws_restJson1RequestAlreadyInProgressExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1RequestAlreadyInProgressExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DeleteComponentCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
@@ -1334,67 +1145,31 @@ const deserializeAws_restJson1DeleteComponentCommandError = async (output, conte
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.greengrassv2#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DeleteCoreDeviceCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
@@ -1418,67 +1193,31 @@ const deserializeAws_restJson1DeleteCoreDeviceCommandError = async (output, cont
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.greengrassv2#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeComponentCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1538,59 +1277,28 @@ const deserializeAws_restJson1DescribeComponentCommandError = async (output, con
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DisassociateServiceRoleFromAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1618,27 +1326,16 @@ const deserializeAws_restJson1DisassociateServiceRoleFromAccountCommandError = a
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1GetComponentCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1674,59 +1371,28 @@ const deserializeAws_restJson1GetComponentCommandError = async (output, context)
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1GetComponentVersionArtifactCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1754,59 +1420,28 @@ const deserializeAws_restJson1GetComponentVersionArtifactCommandError = async (o
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1GetConnectivityInfoCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1838,35 +1473,19 @@ const deserializeAws_restJson1GetConnectivityInfoCommandError = async (output, c
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1GetCoreDeviceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1918,59 +1537,28 @@ const deserializeAws_restJson1GetCoreDeviceCommandError = async (output, context
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1GetDeploymentCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2046,59 +1634,28 @@ const deserializeAws_restJson1GetDeploymentCommandError = async (output, context
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1GetServiceRoleForAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2130,27 +1687,16 @@ const deserializeAws_restJson1GetServiceRoleForAccountCommandError = async (outp
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListClientDevicesAssociatedWithCoreDeviceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2182,59 +1728,28 @@ const deserializeAws_restJson1ListClientDevicesAssociatedWithCoreDeviceCommandEr
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListComponentsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2266,51 +1781,25 @@ const deserializeAws_restJson1ListComponentsCommandError = async (output, contex
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListComponentVersionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2342,59 +1831,28 @@ const deserializeAws_restJson1ListComponentVersionsCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListCoreDevicesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2426,51 +1884,25 @@ const deserializeAws_restJson1ListCoreDevicesCommandError = async (output, conte
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListDeploymentsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2502,51 +1934,25 @@ const deserializeAws_restJson1ListDeploymentsCommandError = async (output, conte
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListEffectiveDeploymentsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2578,59 +1984,28 @@ const deserializeAws_restJson1ListEffectiveDeploymentsCommandError = async (outp
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListInstalledComponentsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2662,59 +2037,28 @@ const deserializeAws_restJson1ListInstalledComponentsCommandError = async (outpu
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListTagsForResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2742,43 +2086,22 @@ const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, c
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ResolveComponentCandidatesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2806,67 +2129,31 @@ const deserializeAws_restJson1ResolveComponentCandidatesCommandError = async (ou
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.greengrassv2#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.greengrassv2#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ThrottlingException":
         case "com.amazonaws.greengrassv2#ThrottlingException":
-            response = {
-                ...(await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1TagResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2890,43 +2177,22 @@ const deserializeAws_restJson1TagResourceCommandError = async (output, context)
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UntagResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2950,43 +2216,22 @@ const deserializeAws_restJson1UntagResourceCommandError = async (output, context
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.greengrassv2#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpdateConnectivityInfoCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3018,58 +2263,34 @@ const deserializeAws_restJson1UpdateConnectivityInfoCommandError = async (output
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.greengrassv2#InternalServerException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.greengrassv2#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new GreengrassV2ServiceException_1.GreengrassV2ServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1AccessDeniedExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "AccessDeniedException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.AccessDeniedException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ConflictException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-        resourceId: undefined,
-        resourceType: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
@@ -3080,16 +2301,14 @@ const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, c
     if (data.resourceType !== undefined && data.resourceType !== null) {
         contents.resourceType = smithy_client_1.expectString(data.resourceType);
     }
-    return contents;
+    const exception = new models_0_1.ConflictException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InternalServerExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "InternalServerException",
-        $fault: "server",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-        retryAfterSeconds: undefined,
-    };
+    const contents = {};
     if (parsedOutput.headers["retry-after"] !== undefined) {
         contents.retryAfterSeconds = smithy_client_1.strictParseInt32(parsedOutput.headers["retry-after"]);
     }
@@ -3097,30 +2316,26 @@ const deserializeAws_restJson1InternalServerExceptionResponse = async (parsedOut
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.InternalServerException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1RequestAlreadyInProgressExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "RequestAlreadyInProgressException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.RequestAlreadyInProgressException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ResourceNotFoundException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-        resourceId: undefined,
-        resourceType: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
@@ -3131,19 +2346,14 @@ const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedO
     if (data.resourceType !== undefined && data.resourceType !== null) {
         contents.resourceType = smithy_client_1.expectString(data.resourceType);
     }
-    return contents;
+    const exception = new models_0_1.ResourceNotFoundException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ServiceQuotaExceededException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-        quotaCode: undefined,
-        resourceId: undefined,
-        resourceType: undefined,
-        serviceCode: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
@@ -3160,18 +2370,14 @@ const deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = async (par
     if (data.serviceCode !== undefined && data.serviceCode !== null) {
         contents.serviceCode = smithy_client_1.expectString(data.serviceCode);
     }
-    return contents;
+    const exception = new models_0_1.ServiceQuotaExceededException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ThrottlingExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ThrottlingException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-        quotaCode: undefined,
-        retryAfterSeconds: undefined,
-        serviceCode: undefined,
-    };
+    const contents = {};
     if (parsedOutput.headers["retry-after"] !== undefined) {
         contents.retryAfterSeconds = smithy_client_1.strictParseInt32(parsedOutput.headers["retry-after"]);
     }
@@ -3185,17 +2391,14 @@ const deserializeAws_restJson1ThrottlingExceptionResponse = async (parsedOutput,
     if (data.serviceCode !== undefined && data.serviceCode !== null) {
         contents.serviceCode = smithy_client_1.expectString(data.serviceCode);
     }
-    return contents;
+    const exception = new models_0_1.ThrottlingException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ValidationExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ValidationException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        fields: undefined,
-        message: undefined,
-        reason: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.fields !== undefined && data.fields !== null) {
         contents.fields = deserializeAws_restJson1ValidationExceptionFieldList(data.fields, context);
@@ -3206,7 +2409,11 @@ const deserializeAws_restJson1ValidationExceptionResponse = async (parsedOutput,
     if (data.reason !== undefined && data.reason !== null) {
         contents.reason = smithy_client_1.expectString(data.reason);
     }
-    return contents;
+    const exception = new models_0_1.ValidationException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const serializeAws_restJson1AssociateClientDeviceWithCoreDeviceEntry = (input, context) => {
     return {
@@ -3662,7 +2869,7 @@ const deserializeAws_restJson1AssociateClientDeviceWithCoreDeviceErrorEntry = (o
     };
 };
 const deserializeAws_restJson1AssociateClientDeviceWithCoreDeviceErrorList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3670,6 +2877,7 @@ const deserializeAws_restJson1AssociateClientDeviceWithCoreDeviceErrorList = (ou
         }
         return deserializeAws_restJson1AssociateClientDeviceWithCoreDeviceErrorEntry(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1AssociatedClientDevice = (output, context) => {
     return {
@@ -3680,7 +2888,7 @@ const deserializeAws_restJson1AssociatedClientDevice = (output, context) => {
     };
 };
 const deserializeAws_restJson1AssociatedClientDeviceList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3688,6 +2896,7 @@ const deserializeAws_restJson1AssociatedClientDeviceList = (output, context) =>
         }
         return deserializeAws_restJson1AssociatedClientDevice(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1CloudComponentStatus = (output, context) => {
     return {
@@ -3708,7 +2917,7 @@ const deserializeAws_restJson1Component = (output, context) => {
     };
 };
 const deserializeAws_restJson1ComponentConfigurationPathList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3716,6 +2925,7 @@ const deserializeAws_restJson1ComponentConfigurationPathList = (output, context)
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ComponentConfigurationUpdate = (output, context) => {
     return {
@@ -3762,7 +2972,7 @@ const deserializeAws_restJson1ComponentLatestVersion = (output, context) => {
     };
 };
 const deserializeAws_restJson1ComponentList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3770,6 +2980,7 @@ const deserializeAws_restJson1ComponentList = (output, context) => {
         }
         return deserializeAws_restJson1Component(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ComponentPlatform = (output, context) => {
     return {
@@ -3780,7 +2991,7 @@ const deserializeAws_restJson1ComponentPlatform = (output, context) => {
     };
 };
 const deserializeAws_restJson1ComponentPlatformList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3788,6 +2999,7 @@ const deserializeAws_restJson1ComponentPlatformList = (output, context) => {
         }
         return deserializeAws_restJson1ComponentPlatform(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ComponentRunWith = (output, context) => {
     return {
@@ -3799,7 +3011,7 @@ const deserializeAws_restJson1ComponentRunWith = (output, context) => {
     };
 };
 const deserializeAws_restJson1ComponentVersionList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3807,6 +3019,7 @@ const deserializeAws_restJson1ComponentVersionList = (output, context) => {
         }
         return deserializeAws_restJson1ComponentVersionListItem(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ComponentVersionListItem = (output, context) => {
     return {
@@ -3824,7 +3037,7 @@ const deserializeAws_restJson1ConnectivityInfo = (output, context) => {
     };
 };
 const deserializeAws_restJson1connectivityInfoList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3832,6 +3045,7 @@ const deserializeAws_restJson1connectivityInfoList = (output, context) => {
         }
         return deserializeAws_restJson1ConnectivityInfo(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1CoreDevice = (output, context) => {
     return {
@@ -3843,7 +3057,7 @@ const deserializeAws_restJson1CoreDevice = (output, context) => {
     };
 };
 const deserializeAws_restJson1CoreDevicesList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3851,6 +3065,7 @@ const deserializeAws_restJson1CoreDevicesList = (output, context) => {
         }
         return deserializeAws_restJson1CoreDevice(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1Deployment = (output, context) => {
     return {
@@ -3890,7 +3105,7 @@ const deserializeAws_restJson1DeploymentIoTJobConfiguration = (output, context)
     };
 };
 const deserializeAws_restJson1DeploymentList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3898,6 +3113,7 @@ const deserializeAws_restJson1DeploymentList = (output, context) => {
         }
         return deserializeAws_restJson1Deployment(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1DeploymentPolicies = (output, context) => {
     return {
@@ -3918,7 +3134,7 @@ const deserializeAws_restJson1DisassociateClientDeviceFromCoreDeviceErrorEntry =
     };
 };
 const deserializeAws_restJson1DisassociateClientDeviceFromCoreDeviceErrorList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3926,6 +3142,7 @@ const deserializeAws_restJson1DisassociateClientDeviceFromCoreDeviceErrorList =
         }
         return deserializeAws_restJson1DisassociateClientDeviceFromCoreDeviceErrorEntry(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1EffectiveDeployment = (output, context) => {
     return {
@@ -3946,7 +3163,7 @@ const deserializeAws_restJson1EffectiveDeployment = (output, context) => {
     };
 };
 const deserializeAws_restJson1EffectiveDeploymentsList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3954,6 +3171,7 @@ const deserializeAws_restJson1EffectiveDeploymentsList = (output, context) => {
         }
         return deserializeAws_restJson1EffectiveDeployment(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1InstalledComponent = (output, context) => {
     return {
@@ -3965,7 +3183,7 @@ const deserializeAws_restJson1InstalledComponent = (output, context) => {
     };
 };
 const deserializeAws_restJson1InstalledComponentList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3973,6 +3191,7 @@ const deserializeAws_restJson1InstalledComponentList = (output, context) => {
         }
         return deserializeAws_restJson1InstalledComponent(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1IoTJobAbortConfig = (output, context) => {
     return {
@@ -3990,7 +3209,7 @@ const deserializeAws_restJson1IoTJobAbortCriteria = (output, context) => {
     };
 };
 const deserializeAws_restJson1IoTJobAbortCriteriaList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3998,6 +3217,7 @@ const deserializeAws_restJson1IoTJobAbortCriteriaList = (output, context) => {
         }
         return deserializeAws_restJson1IoTJobAbortCriteria(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1IoTJobExecutionsRolloutConfig = (output, context) => {
     return {
@@ -4047,7 +3267,7 @@ const deserializeAws_restJson1ResolvedComponentVersion = (output, context) => {
     };
 };
 const deserializeAws_restJson1ResolvedComponentVersionsList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4055,6 +3275,7 @@ const deserializeAws_restJson1ResolvedComponentVersionsList = (output, context)
         }
         return deserializeAws_restJson1ResolvedComponentVersion(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1StringMap = (output, context) => {
     return Object.entries(output).reduce((acc, [key, value]) => {
@@ -4091,7 +3312,7 @@ const deserializeAws_restJson1ValidationExceptionField = (output, context) => {
     };
 };
 const deserializeAws_restJson1ValidationExceptionFieldList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4099,6 +3320,7 @@ const deserializeAws_restJson1ValidationExceptionFieldList = (output, context) =
         }
         return deserializeAws_restJson1ValidationExceptionField(entry, context);
     });
+    return retVal;
 };
 const deserializeMetadata = (output) => {
     var _a;