diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 90bac313..1ea927d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v7
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           java-version: '21'
           distribution: 'temurin'
@@ -32,7 +32,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v6
 
       - name: Build with Gradle Wrapper
-        run: ./gradlew clean build
+        run: ./gradlew build
 
       - uses: actions/upload-artifact@v7
         with:
diff --git a/src/main/java/net/buildtheearth/buildteamtools/modules/network/model/BuildTeam.java b/src/main/java/net/buildtheearth/buildteamtools/modules/network/model/BuildTeam.java
index 823c563e..e6936e55 100644
--- a/src/main/java/net/buildtheearth/buildteamtools/modules/network/model/BuildTeam.java
+++ b/src/main/java/net/buildtheearth/buildteamtools/modules/network/model/BuildTeam.java
@@ -65,7 +65,8 @@ public BuildTeam(String ID, String serverIP, String name, String blankName, Stri
         this.allowsTransfers = allowsTransfers;
         this.tag = tag;
 
-        if (isConnected && NetworkModule.getInstance().getBuildTeam() != null && NetworkModule.getInstance().getBuildTeam().isConnected())
+        if (isConnected && (NetworkModule.getInstance() == null ||
+                (NetworkModule.getInstance().getBuildTeam() != null && NetworkModule.getInstance().getBuildTeam().isConnected())))
             this.IP = null;
         else
             this.IP = (!isConnected) ? serverIP : tag.toLowerCase() + ".buildtheearth.net";
diff --git a/src/test/java/net/buildtheearth/buildteamtools/modules/network/model/BuildTeamRoutingStateTest.java b/src/test/java/net/buildtheearth/buildteamtools/modules/network/model/BuildTeamRoutingStateTest.java
index 4c251e5b..68be5165 100644
--- a/src/test/java/net/buildtheearth/buildteamtools/modules/network/model/BuildTeamRoutingStateTest.java
+++ b/src/test/java/net/buildtheearth/buildteamtools/modules/network/model/BuildTeamRoutingStateTest.java
@@ -1,11 +1,9 @@
 package net.buildtheearth.buildteamtools.modules.network.model;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@DisabledIfEnvironmentVariable(named = "CI", matches = "true")
 class BuildTeamRoutingStateTest {
 
     @Test