diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 334930f62e..4bc1552433 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -898,7 +898,7 @@ public class CraftWorld implements World {
 
     public void explodeBlock(Block block, float yield) {
         // First of all, don't explode fire
-        if (block.getType().equals(Material.FIRE)) {
+        if (block.getType().equals(org.bukkit.Material.AIR) || block.getType().equals(org.bukkit.Material.FIRE)) {
             return;
         }
         int blockId = block.getTypeId();