diff --git a/build.gradle.kts b/build.gradle.kts
index 25214ee..a5ba03d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "org.adde0109"
-version = "1.5.0-beta"
+version = "1.5.0-rc1"
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/org/adde0109/ambassador/Ambassador.java b/src/main/java/org/adde0109/ambassador/Ambassador.java
index 662dfdb..ac56e1a 100644
--- a/src/main/java/org/adde0109/ambassador/Ambassador.java
+++ b/src/main/java/org/adde0109/ambassador/Ambassador.java
@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
 import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19;
 import static com.velocitypowered.proxy.protocol.packet.brigadier.ArgumentIdentifier.mapSet;
 
-@Plugin(id = "ambassador", name = "Ambassador", version = "1.5.0-beta", authors = {"adde0109"})
+@Plugin(id = "ambassador", name = "Ambassador", version = "1.5.0-rc1", authors = {"adde0109"})
 public class Ambassador {
 
   //Don't forget to update checkCompatibleVersion() when changing this value
diff --git a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java
index 22f1179..4816f79 100644
--- a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java
+++ b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java
@@ -90,6 +90,15 @@ public enum VelocityForgeBackendConnectionPhase implements BackendConnectionPhas
         return;
       }
 
+      if (clientPhase.forgeHandshake.getModListReplyPacket() == null) {
+        //We have nothing to respond with during this handshake. Unable to proceed.
+        Ambassador.getInstance().logger.error("Unable for {} to switch servers. " +
+                "Vanilla({}) -> Forge({}) switch without reset is not yet supported!", player.getGameProfile().getName(),
+                player.getConnectedServer().getServerInfo().getName(), server.getServerInfo().getName());
+        server.disconnect();
+        return;
+      }
+
       if (message instanceof ModListPacket modListPacket) {
         remainingRegistries = new CountDownLatch(modListPacket.getRegistries().size());