diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java
index 08e7fcf522..d5d2f747e2 100644
--- a/core/src/mindustry/ai/BlockIndexer.java
+++ b/core/src/mindustry/ai/BlockIndexer.java
@@ -112,6 +112,8 @@ public class BlockIndexer{
 
     /** Updates all the structure quadrants for a newly activated team. */
     public void updateTeamIndex(Team team){
+        if(structQuadrants == null) return;
+
         //go through every tile... ouch
         for(int x = 0; x < world.width(); x++){
             for(int y = 0; y < world.height(); y++){
diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java
index a0f489cff7..5d2b570cd2 100644
--- a/core/src/mindustry/game/Teams.java
+++ b/core/src/mindustry/game/Teams.java
@@ -125,6 +125,10 @@ public class Teams{
     }
 
     private void updateEnemies(){
+        if(!active.contains(get(state.rules.waveTeam))){
+            active.add(get(state.rules.waveTeam));
+        }
+
         for(TeamData data : active){
             data.enemies.clear();
             for(TeamData other : active){
diff --git a/core/src/mindustry/world/blocks/BuildBlock.java b/core/src/mindustry/world/blocks/BuildBlock.java
index 1ba7bff365..79061db553 100644
--- a/core/src/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/mindustry/world/blocks/BuildBlock.java
@@ -337,6 +337,7 @@ public class BuildBlock extends Block{
         }
 
         public void setDeconstruct(Block previous){
+            if(previous == null) return;
             this.previous = previous;
             this.progress = 1f;
             if(previous.buildCost >= 0.01f){
diff --git a/core/src/mindustry/world/blocks/StaticWall.java b/core/src/mindustry/world/blocks/StaticWall.java
index d81e0521db..531fb010a2 100644
--- a/core/src/mindustry/world/blocks/StaticWall.java
+++ b/core/src/mindustry/world/blocks/StaticWall.java
@@ -43,9 +43,9 @@ public class StaticWall extends Rock{
 
     boolean eq(int rx, int ry){
         return rx < world.width() - 1 && ry < world.height() - 1
-        && world.tile(rx + 1, ry).block() == this
-        && world.tile(rx, ry + 1).block() == this
-        && world.tile(rx, ry).block() == this
-        && world.tile(rx + 1, ry + 1).block() == this;
+            && world.tile(rx + 1, ry).block() == this
+            && world.tile(rx, ry + 1).block() == this
+            && world.tile(rx, ry).block() == this
+            && world.tile(rx + 1, ry + 1).block() == this;
     }
 }