diff --git a/ivette/src/frama-c/server.ts b/ivette/src/frama-c/server.ts
index 633839855c693832a08bb16eac4416248dc5dcec..d4f5c94ba9e6456f2dc163598f58a34b0b62610f 100644
--- a/ivette/src/frama-c/server.ts
+++ b/ivette/src/frama-c/server.ts
@@ -762,13 +762,9 @@ export function send<In, Out>(
   const response: Response<Out> = new Promise<Out>((resolve, reject) => {
     const unwrap = (js: Json.json): void => {
       try {
-        const data = request.output(js);
-        if (data !== undefined)
-          resolve(data);
-        else
-          reject('Wrong response type');
+        resolve(request.output(js));
       } catch (err) {
-        reject(`Decoding Error (${err})`);
+        reject(`Invalid ${request.name} response (${err})`);
       }
     };
     pending.set(rid, { resolve: unwrap, reject });