diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a1d2fa7f3..691661088 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2222,7 +2222,7 @@ public final class CraftServer implements Server {
 
     @Override
     public BlockData createBlockData(org.bukkit.Material material, String data) {
-        Preconditions.checkArgument(material != null, "Material cannot be null");
+        Preconditions.checkArgument(material != null || data != null, "Must provide one of material or data");
 
         return CraftBlockData.newData(material, data);
     }