diff --git a/code/API_definitions/device-swap.yaml b/code/API_definitions/device-swap.yaml
index 735941b..058c2e3 100644
--- a/code/API_definitions/device-swap.yaml
+++ b/code/API_definitions/device-swap.yaml
@@ -277,7 +277,16 @@ components:
       content:
         application/json:
           schema:
-            $ref: "#/components/schemas/ErrorInfo"
+            allOf:
+              - $ref: "#/components/schemas/ErrorInfo"
+              - type: object
+                properties:
+                  status:
+                    enum:
+                      - 400
+                  code:
+                    enum:
+                      - INVALID_ARGUMENT
           examples:
             GENERIC_400_INVALID_ARGUMENT:
               description: Invalid Argument. Generic Syntax Exception
@@ -286,10 +295,7 @@ components:
                 code: INVALID_ARGUMENT
                 message: Client specified an invalid argument, request body or query param.
     Generic400Check:
-      description: |-
-        Bad Request
-        In addition to regular scenario of INVALID_ARGUMENT, other scenarios may exist:
-        - Out of Range. Specific Syntax Exception used when a given field has a pre-defined range or a invalid filter criteria combination is requested ("code": "OUT_OF_RANGE","message": "Client specified an invalid range.")
+      description: Bad Request
       headers:
         x-correlator:
           $ref: "#/components/headers/x-correlator"