diff --git a/common/src/main/java/us/myles/ViaVersion/ViaManager.java b/common/src/main/java/us/myles/ViaVersion/ViaManager.java
index 2e116b867..d1e523a70 100644
--- a/common/src/main/java/us/myles/ViaVersion/ViaManager.java
+++ b/common/src/main/java/us/myles/ViaVersion/ViaManager.java
@@ -137,7 +137,10 @@ public class ViaManager {
     }
 
     public void handleDisconnect(UUID id) {
-        handleDisconnect(getConnection(id));
+        UserConnection connection = getConnection(id);
+        if (connection != null) {
+            handleDisconnect(connection);
+        }
     }
 
     public void handleDisconnect(UserConnection info) {