diff --git a/src/matrix/matrix-command-handler.js b/src/matrix/matrix-command-handler.js
index 8c0c3c2..07ae178 100644
--- a/src/matrix/matrix-command-handler.js
+++ b/src/matrix/matrix-command-handler.js
@@ -314,39 +314,45 @@ const commands = [{
 			}
 			catch (e_raw){
 				const e = unmarshallDiscordError(e_raw)
-				switch (e.code) {
-					case "NO_ATTACH_TARGET": return api.sendEvent(event.room_id, "m.room.message", {
+				if (e.code === "NO_ATTACH_TARGET") {
+					return api.sendEvent(event.room_id, "m.room.message", {
 						...ctx,
 						msgtype: "m.text",
 						"body": "⚠️ Couldn't find a Discord representation of the message under which you're trying to attach this thread (event ID `"+e_raw.was_supposed_to_be+"` on Matrix), so it wasn't created. Either you ran this command on an unbridged message (one sent by this bot or one that failed to bridge due to a previous error), or this is an error on our side and should be reported.",
     					"format": "org.matrix.custom.html",
     					"formatted_body": "⚠️ Couldn't find a Discord representation of the message under which you're trying to attach this thread (event ID <code>"+e_raw.was_supposed_to_be+"</code> on Matrix), so it wasn't created. Either you ran this command on an unbridged message (one sent by this bot or one that failed to bridge due to a previous error), or this is an error on our side and should be reported."
 					})
-					case (160004): // see: https://docs.discord.com/developers/topics/opcodes-and-status-codes
-						return api.sendEvent(event.room_id, "m.room.message", {
-							...ctx,
-							msgtype: "m.text",
-							"body": "There already exist a thread for the message you ran this command on (please run `/thread` (with no arguments and outside any threads) for details on attachment rules, if you're unsure what „ran this command on” refers to); cannot create a new one. Scroll up and see where the link could be.",
-							"format": "org.matrix.custom.html",
-							"formatted_body": "There already exist a thread for the message you ran this command on (please run <code>/thread</code> (with no arguments and outside any threads) for details on attachment rules, if you're unsure what „ran this command on” refers to); cannot create a new one. Scroll up and see where the link could be.",
-						})
-					case (50024): return api.sendEvent(event.room_id, "m.room.message", {
+				}
+				else if (e.code === 160004) { // see: https://docs.discord.com/developers/topics/opcodes-and-status-codes
+					return api.sendEvent(event.room_id, "m.room.message", {
+						...ctx,
+						msgtype: "m.text",
+						"body": "There already exist a thread for the message you ran this command on (please run `/thread` (with no arguments and outside any threads) for details on attachment rules, if you're unsure what „ran this command on” refers to); cannot create a new one. Scroll up and see where the link could be.",
+						"format": "org.matrix.custom.html",
+						"formatted_body": "There already exist a thread for the message you ran this command on (please run <code>/thread</code> (with no arguments and outside any threads) for details on attachment rules, if you're unsure what „ran this command on” refers to); cannot create a new one. Scroll up and see where the link could be.",
+					})
+				}
+				else if (e.code === 50024) {
+					return api.sendEvent(event.room_id, "m.room.message", {
 						...ctx,
 						msgtype: "m.text",
 						body: "You cannot create threads in a Discord channel of the type, to which this Matrix room is bridged to. Did you try to create a thread inside a thread?"
 					})
-					case (50035): return api.sendEvent(event.room_id, "m.room.message", {
+				}
+				/*else if (e.code === 50035) {
+					return api.sendEvent(event.room_id, "m.room.message", {
 						...ctx,
 						msgtype: "m.text",
 						body: "Specified thread name is too long - thread creation failed. Please yap a bit less in the title, the thread body is for that. ;)"
 					})
-					default: 
-						await api.sendEvent(event.room_id, "m.room.message", {
-							...ctx,
-							msgtype: "m.text",
-							body: "Unknown error occurred during thread creation. See error message below (or on the main channel, if the command was ran inside a thread) for details."
-						})
-						throw e_raw;
+				}*/
+				else {
+					await api.sendEvent(event.room_id, "m.room.message", {
+						...ctx,
+						msgtype: "m.text",
+						body: "Unknown error occurred during thread creation. See error message below (or on the main channel, if the command was ran inside a thread) for details."
+					})
+					throw e_raw;
 				}
 			}
 		}