2 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 92226644..f19df71f 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -134,6 +134,7 @@ public class CraftBlock implements Block {
 
     @Override
     public void setType(Material type, boolean applyPhysics) {
+        Preconditions.checkArgument(type != null, "Material cannot be null");
         setBlockData(type.createBlockData(), applyPhysics);
     }
 
@@ -144,6 +145,7 @@ public class CraftBlock implements Block {
 
     @Override
     public void setBlockData(BlockData data, boolean applyPhysics) {
+        Preconditions.checkArgument(data != null, "BlockData cannot be null");
         setTypeAndData(((CraftBlockData) data).getState(), applyPhysics);
     }
 
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
index 5cf595e2..13ac9bf2 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
@@ -1,5 +1,6 @@
 package org.bukkit.craftbukkit.block;
 
+import com.google.common.base.Preconditions;
 import net.minecraft.server.BlockPosition;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
@@ -98,6 +99,7 @@ public class CraftBlockState implements BlockState {
 
     @Override
     public void setBlockData(BlockData data) {
+        Preconditions.checkArgument(data != null, "BlockData cannot be null");
         this.data = ((CraftBlockData) data).getState();
     }
 
@@ -121,6 +123,7 @@ public class CraftBlockState implements BlockState {
     }
 
     public void setType(final Material type) {
+        Preconditions.checkArgument(type != null, "Material cannot be null");
         if (this.getType() != type) {
             this.data = CraftMagicNumbers.getBlock(type).getBlockData();
         }