diff --git a/core/src/mindustry/ai/types/BuilderAI.java b/core/src/mindustry/ai/types/BuilderAI.java
index 8106e6731a..40a008c6c7 100644
--- a/core/src/mindustry/ai/types/BuilderAI.java
+++ b/core/src/mindustry/ai/types/BuilderAI.java
@@ -53,7 +53,7 @@ public class BuilderAI extends AIController{
             if((retreatTimer += Time.delta) >= retreatDelay){
                 if(enemy != null){
                     var core = unit.closestCore();
-                    if(!unit.within(core, retreatDst)){
+                    if(core != null && !unit.within(core, retreatDst)){
                         moveTo(core, retreatDst);
                     }
                 }
diff --git a/core/src/mindustry/ai/types/RepairAI.java b/core/src/mindustry/ai/types/RepairAI.java
index 24b6ac424b..23feb2a0eb 100644
--- a/core/src/mindustry/ai/types/RepairAI.java
+++ b/core/src/mindustry/ai/types/RepairAI.java
@@ -45,7 +45,7 @@ public class RepairAI extends AIController{
                 //fly away from enemy when not doing anything
                 if(avoid != null){
                     var core = unit.closestCore();
-                    if(!unit.within(core, retreatDst)){
+                    if(core != null && !unit.within(core, retreatDst)){
                         moveTo(core, retreatDst);
                     }
                 }