diff --git a/core/src/io/anuke/mindustry/maps/generation/Generation.java b/core/src/io/anuke/mindustry/maps/generation/Generation.java
index 5677d57f86..d639e36107 100644
--- a/core/src/io/anuke/mindustry/maps/generation/Generation.java
+++ b/core/src/io/anuke/mindustry/maps/generation/Generation.java
@@ -45,7 +45,7 @@ public class Generation{
                         return null;
                     }
 
-                    if(!block.isValid(tiles[worldx][worldy])) continue;
+                    if(!block.isValid(tiles[worldx][worldy]) || tiles[worldx][worldy].floor().drops == null) continue;
 
                     Item drop = tiles[worldx][worldy].floor().drops.item;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
index ca912aa8f4..a6e65cc1d8 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
@@ -253,7 +253,7 @@ public class ItemBridge extends Block{
 
             if(rel == rel2) return false;
         }else{
-            return source.block() instanceof ItemBridge && source.<ItemBridgeEntity>entity().link == tile.packedPosition();
+            return source.block() instanceof ItemBridge && source.<ItemBridgeEntity>entity().link == tile.packedPosition() && tile.entity.items.total() < itemCapacity;
         }
 
         return tile.entity.items.total() < itemCapacity;