diff --git a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java b/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
index c4c26b4d63..c8daf3cf10 100644
--- a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
+++ b/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java
@@ -86,7 +86,7 @@ public class WaveInfoDialog extends FloatingDialog{
                     }
                 }
             }).growX().height(70f);
-        }).growY().width(200f).growY();
+        }).growY().width(180f).growY();
 
         buildGroups();
     }
@@ -214,6 +214,8 @@ public class WaveInfoDialog extends FloatingDialog{
                     spawned[spawn.type.id] += spawn.getUnitsSpawned(wave);
                 }
 
+                int f = 0;
+
                 for(int j = 0; j < spawned.length; j++){
                     if(spawned[j] > 0){
                         UnitType type = content.getByID(ContentType.unit, j);
@@ -226,7 +228,7 @@ public class WaveInfoDialog extends FloatingDialog{
                 if(table.getChildren().size == 1){
                     table.add("$none").color(Pal.remove);
                 }
-            }).width(130f).pad(2f);
+            }).width(110f).pad(2f);
 
             preview.row();
         }
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerDistributor.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerDistributor.java
index d7011f7261..5a4bbfcdce 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/PowerDistributor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerDistributor.java
@@ -13,6 +13,8 @@ public class PowerDistributor extends PowerBlock{
 
     @Override
     public void update(Tile tile){
-        tile.entity.power.graph.update();
+        if(tile.entity != null && tile.entity.power != null && tile.entity.power.graph != null){
+            tile.entity.power.graph.update();
+        }
     }
 }