diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 5a53076f6..046b75c62 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -310,6 +310,9 @@ public class CraftBlock implements Block {
     }
 
     public static EnumDirection blockFaceToNotch(BlockFace face) {
+        if (face == null) {
+            return null;
+        }
         switch (face) {
             case DOWN:
                 return EnumDirection.DOWN;