diff --git a/src/s2s.py b/src/s2s.py
index 9aab12d..09bad27 100644
--- a/src/s2s.py
+++ b/src/s2s.py
@@ -293,12 +293,18 @@ async def send_join_v2(roomId, eventId):
 
 @server.route("/_matrix/federation/v1/make_join/<roomId>/<userId>")
 async def make_join(roomId, userId):
-	if roomId.split(":")[1] != server_name:
+	def not_invited():
 		return jsonify({
 			"errcode": "M_FORBIDDEN",
 			"error": "You are not invited to this room."
 		}), 403
 
+	try:
+		if roomId.split(":")[1] != server_name:
+			return not_invited()
+	except:
+		return not_invited()
+
 	class bullshit:
 		def get_json():
 			return {}