diff --git a/Changelog.md b/Changelog.md
index d5e432baa9..37a633c376 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -16,6 +16,7 @@ et le projet suit un schéma de versionning inspiré de [Calendar Versioning](ht
 #### :bug: Corrections de bugs
 
 - Correction de la mutation `duplicateForm` pour dupliquer l'entreposage provisoire, [PR 700](https://github.com/)
+- Correction d'un bug affichant une erreur serveur à la place d'une erreur de validation graphQL lorsque le typage des variables graphQL est erronée [PR 711](https://github.com/MTES-MCT/trackdechets/pull/711)
 
 #### :nail_care: Améliorations
 
diff --git a/back/package-lock.json b/back/package-lock.json
index 4a41ddde53..3df2064328 100644
--- a/back/package-lock.json
+++ b/back/package-lock.json
@@ -4502,12 +4502,180 @@
       }
     },
     "apollo-server-testing": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/apollo-server-testing/-/apollo-server-testing-2.14.1.tgz",
-      "integrity": "sha512-d0xIySG7yqg/9QcHth0oC7tPgciK+xoyJsmkAXsOX9IUxIlTVOoDIZa71Vwh2d2uwbBoriZ8vY9Z6x8Q8IN5lQ==",
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/apollo-server-testing/-/apollo-server-testing-2.19.0.tgz",
+      "integrity": "sha512-ZrFflLC84ZzBZCfJehC2gLodkb5wwlwYLg+wMXZfDZpBIXDbC0Y9zR0zGqOYhrDMpmI1yIt3fUade33Y4UrNpA==",
       "dev": true,
       "requires": {
-        "apollo-server-core": "^2.14.1"
+        "apollo-server-core": "^2.19.0"
+      },
+      "dependencies": {
+        "@apollographql/graphql-playground-html": {
+          "version": "1.6.26",
+          "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.26.tgz",
+          "integrity": "sha512-XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ==",
+          "dev": true,
+          "requires": {
+            "xss": "^1.0.6"
+          }
+        },
+        "apollo-cache-control": {
+          "version": "0.11.4",
+          "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.4.tgz",
+          "integrity": "sha512-FUKE8ASr8GxVq5rmky/tY8bsf++cleGT591lfLiqnPsP1fo3kAfgRfWA2QRHTCKFNlQxzUhVOEDv+PaysqiOjw==",
+          "dev": true,
+          "requires": {
+            "apollo-server-env": "^2.4.5",
+            "apollo-server-plugin-base": "^0.10.2"
+          }
+        },
+        "apollo-datasource": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.2.tgz",
+          "integrity": "sha512-ibnW+s4BMp4K2AgzLEtvzkjg7dJgCaw9M5b5N0YKNmeRZRnl/I/qBTQae648FsRKgMwTbRQIvBhQ0URUFAqFOw==",
+          "dev": true,
+          "requires": {
+            "apollo-server-caching": "^0.5.2",
+            "apollo-server-env": "^2.4.5"
+          }
+        },
+        "apollo-graphql": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.6.0.tgz",
+          "integrity": "sha512-BxTf5LOQe649e9BNTPdyCGItVv4Ll8wZ2BKnmiYpRAocYEXAVrQPWuSr3dO4iipqAU8X0gvle/Xu9mSqg5b7Qg==",
+          "dev": true,
+          "requires": {
+            "apollo-env": "^0.6.5",
+            "lodash.sortby": "^4.7.0"
+          }
+        },
+        "apollo-server-caching": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz",
+          "integrity": "sha512-HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^5.0.0"
+          }
+        },
+        "apollo-server-core": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.0.tgz",
+          "integrity": "sha512-2aMKUVPyNbomJQaG2tkpfqvp1Tfgxgkdr7nX5zHudYNSzsPrHw+CcYlCbIVFFI/mTZsjoK9czNq1qerFRxZbJw==",
+          "dev": true,
+          "requires": {
+            "@apollographql/apollo-tools": "^0.4.3",
+            "@apollographql/graphql-playground-html": "1.6.26",
+            "@types/graphql-upload": "^8.0.0",
+            "@types/ws": "^7.0.0",
+            "apollo-cache-control": "^0.11.4",
+            "apollo-datasource": "^0.7.2",
+            "apollo-graphql": "^0.6.0",
+            "apollo-reporting-protobuf": "^0.6.1",
+            "apollo-server-caching": "^0.5.2",
+            "apollo-server-env": "^2.4.5",
+            "apollo-server-errors": "^2.4.2",
+            "apollo-server-plugin-base": "^0.10.2",
+            "apollo-server-types": "^0.6.1",
+            "apollo-tracing": "^0.12.0",
+            "async-retry": "^1.2.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "graphql-extensions": "^0.12.6",
+            "graphql-tag": "^2.9.2",
+            "graphql-tools": "^4.0.0",
+            "graphql-upload": "^8.0.2",
+            "loglevel": "^1.6.7",
+            "lru-cache": "^5.0.0",
+            "sha.js": "^2.4.11",
+            "subscriptions-transport-ws": "^0.9.11",
+            "uuid": "^8.0.0",
+            "ws": "^6.0.0"
+          }
+        },
+        "apollo-server-env": {
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz",
+          "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==",
+          "dev": true,
+          "requires": {
+            "node-fetch": "^2.1.2",
+            "util.promisify": "^1.0.0"
+          }
+        },
+        "apollo-server-errors": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.2.tgz",
+          "integrity": "sha512-FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ==",
+          "dev": true
+        },
+        "apollo-server-plugin-base": {
+          "version": "0.10.2",
+          "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.2.tgz",
+          "integrity": "sha512-uM5uL1lOxbXdgvt/aEIbgs40fV9xA45Y3Mmh0VtQ/ddqq0MXR5aG92nnf8rM+URarBCUfxKJKaYzJJ/CXAnEdA==",
+          "dev": true,
+          "requires": {
+            "apollo-server-types": "^0.6.1"
+          }
+        },
+        "apollo-server-types": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.1.tgz",
+          "integrity": "sha512-IEQ37aYvMLiTUzsySVLOSuvvhxuyYdhI05f3cnH6u2aN1HgGp7vX6bg+U3Ue8wbHfdcifcGIk5UEU+Q+QO6InA==",
+          "dev": true,
+          "requires": {
+            "apollo-reporting-protobuf": "^0.6.1",
+            "apollo-server-caching": "^0.5.2",
+            "apollo-server-env": "^2.4.5"
+          }
+        },
+        "apollo-tracing": {
+          "version": "0.12.0",
+          "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.0.tgz",
+          "integrity": "sha512-cMUYGE6mOEwb9HDqhf4fiPEo2JMhjPIqEprAQEC57El76avRpRig5NM0bnqMZcYJZR5QmLlNcttNccOwf9WrNg==",
+          "dev": true,
+          "requires": {
+            "apollo-server-env": "^2.4.5",
+            "apollo-server-plugin-base": "^0.10.2"
+          }
+        },
+        "graphql-extensions": {
+          "version": "0.12.6",
+          "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.6.tgz",
+          "integrity": "sha512-EUNw+OIRXYTPxToSoJjhJvS5aGa94KkdkZnL1I9DCZT64/+rzQNeLeGj+goj2RYuYvoQe1Bmcx0CNZ1GqwBhng==",
+          "dev": true,
+          "requires": {
+            "@apollographql/apollo-tools": "^0.4.3",
+            "apollo-server-env": "^2.4.5",
+            "apollo-server-types": "^0.6.1"
+          }
+        },
+        "graphql-tools": {
+          "version": "4.0.8",
+          "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.8.tgz",
+          "integrity": "sha512-MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg==",
+          "dev": true,
+          "requires": {
+            "apollo-link": "^1.2.14",
+            "apollo-utilities": "^1.0.1",
+            "deprecated-decorator": "^0.1.6",
+            "iterall": "^1.1.3",
+            "uuid": "^3.1.0"
+          },
+          "dependencies": {
+            "uuid": {
+              "version": "3.4.0",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+              "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+              "dev": true
+            }
+          }
+        },
+        "uuid": {
+          "version": "8.3.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
+          "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==",
+          "dev": true
+        }
       }
     },
     "apollo-server-types": {
diff --git a/back/src/__tests__/errors.integration.ts b/back/src/__tests__/errors.integration.ts
index 60a8a6bda5..a8620b12ab 100644
--- a/back/src/__tests__/errors.integration.ts
+++ b/back/src/__tests__/errors.integration.ts
@@ -160,7 +160,7 @@ describe("Error handling", () => {
     process.env.NODE_ENV = "production";
     const server = require("../server").server;
     const { mutate } = createTestClient(server);
-    // invalid variables `toto` instead of `input`
+    // invalid variable `toto` instead of `input`
     const variables = { toto: "toto" };
     const { errors } = await mutate({
       mutation: BAR,
diff --git a/back/src/server.ts b/back/src/server.ts
index 87ad58a786..e34319d2f8 100644
--- a/back/src/server.ts
+++ b/back/src/server.ts
@@ -128,7 +128,7 @@ export const server = new ApolloServer({
       // Workaround for graphQL validation error displayed as internal server error
       // when graphQL variables are of of invalid type
       // See: https://github.com/apollographql/apollo-server/issues/3498
-      if (err.message.startsWith(`Variable "`)) {
+      if (err.message && err.message.startsWith(`Variable "`)) {
         err.extensions.code = "GRAPHQL_VALIDATION_FAILED";
         return err;
       }