diff --git a/eng/tools/azure-sdk-tools/emitter/generated/azure/response-status-code-range/response/statuscoderange/_operations/_operations.py b/eng/tools/azure-sdk-tools/emitter/generated/azure/response-status-code-range/response/statuscoderange/_operations/_operations.py
index 50fb35277183..bfd0bfaf49fe 100644
--- a/eng/tools/azure-sdk-tools/emitter/generated/azure/response-status-code-range/response/statuscoderange/_operations/_operations.py
+++ b/eng/tools/azure-sdk-tools/emitter/generated/azure/response-status-code-range/response/statuscoderange/_operations/_operations.py
@@ -119,6 +119,9 @@ def error_response_status_code404(self, **kwargs: Any) -> None:  # pylint: disab
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
             304: ResourceNotModifiedError,
         }
         error_map.update(kwargs.pop("error_map", {}) or {})
@@ -149,8 +152,7 @@ def error_response_status_code404(self, **kwargs: Any) -> None:  # pylint: disab
             error = None
             if response.status_code == 404:
                 error = _failsafe_deserialize(_models.NotFoundError, response)
-                raise ResourceNotFoundError(response=response, model=error)
-            if 400 <= response.status_code <= 499:
+            elif 400 <= response.status_code <= 499:
                 error = _failsafe_deserialize(_models.Standard4XXError, response)
             raise HttpResponseError(response=response, model=error)
 
diff --git a/eng/tools/azure-sdk-tools/emitter/generated/azure/response-status-code-range/response/statuscoderange/aio/_operations/_operations.py b/eng/tools/azure-sdk-tools/emitter/generated/azure/response-status-code-range/response/statuscoderange/aio/_operations/_operations.py
index 9956fbab1df4..522ba19d781e 100644
--- a/eng/tools/azure-sdk-tools/emitter/generated/azure/response-status-code-range/response/statuscoderange/aio/_operations/_operations.py
+++ b/eng/tools/azure-sdk-tools/emitter/generated/azure/response-status-code-range/response/statuscoderange/aio/_operations/_operations.py
@@ -100,6 +100,9 @@ async def error_response_status_code404(self, **kwargs: Any) -> None:
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
             304: ResourceNotModifiedError,
         }
         error_map.update(kwargs.pop("error_map", {}) or {})
@@ -130,8 +133,7 @@ async def error_response_status_code404(self, **kwargs: Any) -> None:
             error = None
             if response.status_code == 404:
                 error = _failsafe_deserialize(_models.NotFoundError, response)
-                raise ResourceNotFoundError(response=response, model=error)
-            if 400 <= response.status_code <= 499:
+            elif 400 <= response.status_code <= 499:
                 error = _failsafe_deserialize(_models.Standard4XXError, response)
             raise HttpResponseError(response=response, model=error)
 
diff --git a/eng/tools/azure-sdk-tools/emitter/generated/unbranded/response-status-code-range/response/statuscoderange/_operations/_operations.py b/eng/tools/azure-sdk-tools/emitter/generated/unbranded/response-status-code-range/response/statuscoderange/_operations/_operations.py
index 489f4f7c1620..4c6d11ddaccc 100644
--- a/eng/tools/azure-sdk-tools/emitter/generated/unbranded/response-status-code-range/response/statuscoderange/_operations/_operations.py
+++ b/eng/tools/azure-sdk-tools/emitter/generated/unbranded/response-status-code-range/response/statuscoderange/_operations/_operations.py
@@ -108,6 +108,9 @@ def error_response_status_code404(self, **kwargs: Any) -> None:  # pylint: disab
         :raises ~corehttp.exceptions.HttpResponseError:
         """
         error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
             304: ResourceNotModifiedError,
         }
         error_map.update(kwargs.pop("error_map", {}) or {})
@@ -136,8 +139,7 @@ def error_response_status_code404(self, **kwargs: Any) -> None:  # pylint: disab
             error = None
             if response.status_code == 404:
                 error = _failsafe_deserialize(_models.NotFoundError, response)
-                raise ResourceNotFoundError(response=response, model=error)
-            if 400 <= response.status_code <= 499:
+            elif 400 <= response.status_code <= 499:
                 error = _failsafe_deserialize(_models.Standard4XXError, response)
             raise HttpResponseError(response=response, model=error)
 
diff --git a/eng/tools/azure-sdk-tools/emitter/generated/unbranded/response-status-code-range/response/statuscoderange/aio/_operations/_operations.py b/eng/tools/azure-sdk-tools/emitter/generated/unbranded/response-status-code-range/response/statuscoderange/aio/_operations/_operations.py
index 9891adbc09ef..bcb5a69e9e29 100644
--- a/eng/tools/azure-sdk-tools/emitter/generated/unbranded/response-status-code-range/response/statuscoderange/aio/_operations/_operations.py
+++ b/eng/tools/azure-sdk-tools/emitter/generated/unbranded/response-status-code-range/response/statuscoderange/aio/_operations/_operations.py
@@ -90,6 +90,9 @@ async def error_response_status_code404(self, **kwargs: Any) -> None:
         :raises ~corehttp.exceptions.HttpResponseError:
         """
         error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
             304: ResourceNotModifiedError,
         }
         error_map.update(kwargs.pop("error_map", {}) or {})
@@ -120,8 +123,7 @@ async def error_response_status_code404(self, **kwargs: Any) -> None:
             error = None
             if response.status_code == 404:
                 error = _failsafe_deserialize(_models.NotFoundError, response)
-                raise ResourceNotFoundError(response=response, model=error)
-            if 400 <= response.status_code <= 499:
+            elif 400 <= response.status_code <= 499:
                 error = _failsafe_deserialize(_models.Standard4XXError, response)
             raise HttpResponseError(response=response, model=error)