diff --git a/core/src/Mindustry.gwt.xml b/core/src/Mindustry.gwt.xml
index c7a38eeb99..7698085253 100644
--- a/core/src/Mindustry.gwt.xml
+++ b/core/src/Mindustry.gwt.xml
@@ -20,5 +20,6 @@
 	<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.type.Recipe" />
 	<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.net.Streamable" />
 	<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.world.meta.BlockBar" />
+	<extend-configuration-property name="gdx.reflect.include" value="io.anuke.mindustry.world.mapgen.WorldGenerator" />
 	<extend-configuration-property name="gdx.reflect.include" value="com.badlogic.gdx.utils.Predicate" />
 </module>
\ No newline at end of file
diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java
index e53425605f..75a4d1f1e5 100644
--- a/core/src/io/anuke/mindustry/entities/TileEntity.java
+++ b/core/src/io/anuke/mindustry/entities/TileEntity.java
@@ -170,7 +170,9 @@ public class TileEntity extends BaseEntity implements TargetTrait {
 
 	@Remote(called = Loc.server, in = In.blocks)
 	public static void onTileDamage(Tile tile, float health){
-		tile.entity.health = health;
+		if(tile.entity != null){
+			tile.entity.health = health;
+		}
 	}
 
 	@Remote(called = Loc.server, in = In.blocks)
diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
index 31979b1aed..bd0cf5c971 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
@@ -213,7 +213,7 @@ public class BuildBlock extends Block {
 
                     if (amount > 0) { //if it's positive, add it to the core
                         int accepting = core.tile.block().acceptStack(requirements[i].item, accumulated, core.tile, builder);
-                        core.tile.block().handleStack(requirements[i].item, accumulated, core.tile, builder);
+                        core.tile.block().handleStack(requirements[i].item, accepting, core.tile, builder);
 
                         accumulator[i] -= accepting;
                     }