diff --git a/backend/api.js b/backend/api.js
index e860d8c..f0d78a4 100644
--- a/backend/api.js
+++ b/backend/api.js
@@ -3,7 +3,8 @@ import path from "path";
 import WebSocket from "ws";
 
 import pty from "node-pty";
-import PQueue from "p-queue";
+import pQueue from "p-queue";
+const PQueue = pQueue.default;
 import rpc from "vscode-jsonrpc";
 import { v4 as getUUID } from "uuid";
 
@@ -187,7 +188,6 @@ export class Session {
         return;
       }
       let msg;
-      n;
       try {
         msg = JSON.parse(event);
       } catch (err) {
diff --git a/backend/server.js b/backend/server.js
index 5cc75cd..c47ae87 100644
--- a/backend/server.js
+++ b/backend/server.js
@@ -8,6 +8,7 @@ import _ from "lodash";
 
 import * as api from "./api.js";
 import { langs } from "./langs.js";
+import { log } from "./util.js";
 
 const host = process.env.HOST || "localhost";
 const port = parseInt(process.env.PORT || "") || 6119;
@@ -55,25 +56,29 @@ app.use("/js", express.static("frontend/out"));
 function addWebsocket(baseApp, httpsServer) {
   const app = ws(baseApp, httpsServer).app;
   app.ws("/api/v1/ws", (ws, req) => {
-    const lang = req.query.get("lang");
-    if (!lang) {
-      ws.send(
-        JSON.stringify({
-          event: "error",
-          errorMessage: "No language specified",
-        })
-      );
-      ws.close();
-    } else if (!langs[lang]) {
-      ws.send(
-        JSON.stringify({
-          event: "error",
-          errorMessage: `No such language: ${lang}`,
-        })
-      );
-      ws.close();
-    } else {
-      new api.Session(ws, lang, console.log).setup();
+    try {
+      const lang = req.query.get("lang");
+      if (!lang) {
+        ws.send(
+          JSON.stringify({
+            event: "error",
+            errorMessage: "No language specified",
+          })
+        );
+        ws.close();
+      } else if (!langs[lang]) {
+        ws.send(
+          JSON.stringify({
+            event: "error",
+            errorMessage: `No such language: ${lang}`,
+          })
+        );
+        ws.close();
+      } else {
+        new api.Session(ws, lang, console.log).setup();
+      }
+    } catch (err) {
+      log.error("Unexpected error while handling websocket:", err);
     }
   });
   return app;