diff --git a/cypress.env.json b/cypress.env.json
index 105f111b..4e5facde 100644
--- a/cypress.env.json
+++ b/cypress.env.json
@@ -3,6 +3,7 @@
     "password": "password",
     "name": "The Dude",
     "emailToken": "000000",
+    "serverUrl": "http://localhost:3000",
     "v3_email": "user2@example.com",
     "v3_url": "http://localhost:8081"
 }
diff --git a/cypress/integration/04 - server.ts b/cypress/integration/04 - server.ts
new file mode 100644
index 00000000..07eb2902
--- /dev/null
+++ b/cypress/integration/04 - server.ts	
@@ -0,0 +1,63 @@
+describe("Server", () => {
+    const { serverUrl } = Cypress.env();
+
+    it("can properly respond to valid and invalid requests", () => {
+        cy.request({ url: `${serverUrl}/`, method: "GET", failOnStatusCode: false }).then(
+            (response) => expect(response.status).to.eq(405) // method not allowed
+        );
+
+        cy.request({ url: `${serverUrl}/`, method: "PUT", failOnStatusCode: false }).then(
+            (response) => expect(response.status).to.eq(405) // method not allowed
+        );
+
+        cy.request({ url: `${serverUrl}/`, method: "OPTIONS" });
+
+        cy.request({ url: `${serverUrl}/`, method: "POST", failOnStatusCode: false }).then(
+            (response) => expect(response.status).to.eq(400) // bad request (no json)
+        );
+
+        cy.request({
+            url: `${serverUrl}/`,
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ email: "user@example.com" }),
+        }).then((response) => {
+            expect(response.status).to.eq(200);
+            expect(JSON.stringify(response.body)).to.eq(
+                JSON.stringify({
+                    result: null,
+                    error: {
+                        code: "invalid_request",
+                        message: "",
+                    },
+                    kind: "response",
+                    version: "3.1.0",
+                })
+            );
+        });
+
+        cy.request({
+            url: `${serverUrl}/`,
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+                method: "getAuthInfo",
+                params: [],
+                device: {},
+                auth: {},
+                kind: "request",
+                version: "3.1.0",
+            }),
+        }).then((response) => {
+            expect(response.status).to.eq(200);
+            expect(JSON.stringify(response.body)).to.eq(
+                JSON.stringify({
+                    result: null,
+                    error: { code: "invalid_session", message: "" },
+                    kind: "response",
+                    version: "3.1.0",
+                })
+            );
+        });
+    });
+});
diff --git a/packages/server/src/transport/http.ts b/packages/server/src/transport/http.ts
index 6bbbb6aa..cc7a1673 100644
--- a/packages/server/src/transport/http.ts
+++ b/packages/server/src/transport/http.ts
@@ -60,24 +60,29 @@ export class HTTPReceiver implements Receiver {
                     httpRes.end();
                     break;
                 case "POST":
-                    const body = await readBody(httpReq, this.config.maxRequestSize);
-                    const req = new Request().fromRaw(unmarshal(body));
-                    const ipAddress = httpReq.headers["x-forwarded-for"] || httpReq.socket?.remoteAddress;
-                    req.ipAddress = Array.isArray(ipAddress) ? ipAddress[0] : ipAddress;
-                    const location = req.ipAddress && (await getLocation(req.ipAddress));
-                    req.location = location
-                        ? {
-                              country: location.country?.names["en"],
-                              city: location.city?.names["en"],
-                          }
-                        : undefined;
+                    try {
+                        const body = await readBody(httpReq, this.config.maxRequestSize);
+                        const req = new Request().fromRaw(unmarshal(body));
+                        const ipAddress = httpReq.headers["x-forwarded-for"] || httpReq.socket?.remoteAddress;
+                        req.ipAddress = Array.isArray(ipAddress) ? ipAddress[0] : ipAddress;
+                        const location = req.ipAddress && (await getLocation(req.ipAddress));
+                        req.location = location
+                            ? {
+                                  country: location.country?.names["en"],
+                                  city: location.city?.names["en"],
+                              }
+                            : undefined;
 
-                    const clientVersion = (req.device && req.device.appVersion) || undefined;
-                    const res = await handler(req);
-                    const resBody = marshal(res.toRaw(clientVersion));
-                    httpRes.setHeader("Content-Type", "application/json; charset=utf-8");
-                    httpRes.setHeader("Content-Length", Buffer.byteLength(resBody));
-                    httpRes.write(resBody);
+                        const clientVersion = (req.device && req.device.appVersion) || undefined;
+                        const res = await handler(req);
+                        const resBody = marshal(res.toRaw(clientVersion));
+                        httpRes.setHeader("Content-Type", "application/json; charset=utf-8");
+                        httpRes.setHeader("Content-Length", Buffer.byteLength(resBody));
+                        httpRes.write(resBody);
+                    } catch (error) {
+                        console.error(error);
+                        httpRes.statusCode = 400;
+                    }
                     httpRes.end();
                     break;
                 default: