diff --git a/core/assets/maps/frozenForest.mmap b/core/assets/maps/frozenForest.mmap
index 39ec3bb9ee..06354bf306 100644
Binary files a/core/assets/maps/frozenForest.mmap and b/core/assets/maps/frozenForest.mmap differ
diff --git a/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java b/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java
index 80bc1bdb78..11d110fc31 100644
--- a/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java
@@ -15,6 +15,9 @@ public class TreeBlock extends Block{
         expanded = true;
     }
 
+    @Override
+    public void draw(Tile tile){}
+
     @Override
     public void drawLayer(Tile tile){
         Draw.rect(region, tile.drawx(), tile.drawy(), Mathf.randomSeed(tile.pos(), 0, 4) * 90);
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 5af2f4fc4c..323a6bde73 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -545,12 +545,16 @@ public class ServerControl implements ApplicationListener{
             int slot = Strings.parseInt(arg[0]);
 
             if(!SaveIO.isSaveValid(slot)){
-                err("No save data found for slot.");
+                err("No (valid) save data found for slot.");
                 return;
             }
 
             Core.app.post(() -> {
-                SaveIO.loadFromSlot(slot);
+                try{
+                    SaveIO.loadFromSlot(slot);
+                }catch(Throwable t){
+                    err("Failed to load save. Outdated or corrupt file.");
+                }
                 info("Save loaded.");
                 host();
                 state.set(State.playing);