diff --git a/server/src/websocket.ts b/server/src/websocket.ts
index 50cdba1..b9f638c 100644
--- a/server/src/websocket.ts
+++ b/server/src/websocket.ts
@@ -1,6 +1,7 @@
 import { WebsocketEvent } from "./types/WebsocketEvent";
 import { log, config } from "./main";
 import { Server } from "socket.io";
+import { Status } from "common";
 import glob from "glob";
 import path from "path";
 
@@ -26,7 +27,17 @@ export default async function() {
 		for (var event of events) {
 			socket.on(
 				event.name,
-				(data: any) => event.handler(io, socket, data)
+				(data: any) => {
+					try {
+						event.handler(io, socket, data)
+					} catch (e) {
+						log.error(e);
+						socket.emit("res:error", {
+							status: Status.UnknownError,
+							message: "An unexpected error occured."
+						});
+					};
+				}
 			);
 		};
 	});