diff --git a/gateway/EaglercraftXVelocity/EaglerXVelocity-Latest.jar b/gateway/EaglercraftXVelocity/EaglerXVelocity-Latest.jar
index 90c6a32..74fa0be 100644
Binary files a/gateway/EaglercraftXVelocity/EaglerXVelocity-Latest.jar and b/gateway/EaglercraftXVelocity/EaglerXVelocity-Latest.jar differ
diff --git a/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/EaglerXVelocityVersion.java b/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/EaglerXVelocityVersion.java
index 2940dda..8a98550 100644
--- a/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/EaglerXVelocityVersion.java
+++ b/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/EaglerXVelocityVersion.java
@@ -23,7 +23,7 @@ public class EaglerXVelocityVersion {
 	public static final String PLUGIN_ID = "eaglerxvelocity";
 	public static final String NAME = "EaglercraftXVelocity";
 	public static final String DESCRIPTION = "Plugin to allow EaglercraftX 1.8 players to join your network, or allow EaglercraftX 1.8 players to use your network as a proxy to join other networks";
-	public static final String VERSION = "1.0.3";
+	public static final String VERSION = "1.0.4";
 	public static final String[] AUTHORS = new String[] { "lax1dude", "ayunami2000" };
 
 }
diff --git a/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/server/HttpWebSocketHandler.java b/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/server/HttpWebSocketHandler.java
index 42255de..e24246a 100644
--- a/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/server/HttpWebSocketHandler.java
+++ b/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/server/HttpWebSocketHandler.java
@@ -1233,11 +1233,18 @@ public class HttpWebSocketHandler extends ChannelInboundHandlerAdapter {
 					EaglerXVelocity.proxy().getEventManager().fire(evt).thenAccept(evt2 -> {
 						if(!handlerF.isClosed()) {
 							((MOTDQueryHandler)handlerF).sendToUser();
+							if(!handlerF.isClosed() && !handlerF.shouldKeepAlive()) {
+								handlerF.close();
+							}
 						}
+					}).exceptionally((excep) -> {
+						EaglerXVelocity.logger().error("Failed to handle EaglercraftMOTDEvent!", excep);
+						if(!handlerF.isClosed()) {
+							handlerF.close();
+						}
+						return null;
 					});
-				}
-				if(!handler.isClosed() && !handler.shouldKeepAlive()) {
-					connectionClosed = true;
+				}else if(!handler.isClosed() && !handler.shouldKeepAlive()) {
 					handler.close();
 				}
 			}else {
diff --git a/gateway/EaglercraftXVelocity/src/main/resources/velocity-plugin.json b/gateway/EaglercraftXVelocity/src/main/resources/velocity-plugin.json
index c3cf1ad..dfa74f9 100644
--- a/gateway/EaglercraftXVelocity/src/main/resources/velocity-plugin.json
+++ b/gateway/EaglercraftXVelocity/src/main/resources/velocity-plugin.json
@@ -1 +1 @@
-{"id":"eaglerxvelocity","name":"EaglercraftXVelocity","version":"1.0.3","description":"Plugin to allow EaglercraftX 1.8 players to join your network, or allow EaglercraftX 1.8 players to use your network as a proxy to join other networks","authors":["lax1dude", "ayunami2000"],"dependencies":[],"main":"net.lax1dude.eaglercraft.v1_8.plugin.gateway_velocity.EaglerXVelocity"}
\ No newline at end of file
+{"id":"eaglerxvelocity","name":"EaglercraftXVelocity","version":"1.0.4","description":"Plugin to allow EaglercraftX 1.8 players to join your network, or allow EaglercraftX 1.8 players to use your network as a proxy to join other networks","authors":["lax1dude", "ayunami2000"],"dependencies":[],"main":"net.lax1dude.eaglercraft.v1_8.plugin.gateway_velocity.EaglerXVelocity"}
\ No newline at end of file
diff --git a/gateway_version_velocity b/gateway_version_velocity
index e4c0d46..a6a3a43 100644
--- a/gateway_version_velocity
+++ b/gateway_version_velocity
@@ -1 +1 @@
-1.0.3
\ No newline at end of file
+1.0.4
\ No newline at end of file