diff --git a/src/com/sk89q/worldedit/EditSession.java b/src/com/sk89q/worldedit/EditSession.java
index 227865c58..945431f50 100755
--- a/src/com/sk89q/worldedit/EditSession.java
+++ b/src/com/sk89q/worldedit/EditSession.java
@@ -143,11 +143,17 @@ public class EditSession {
      */
     protected boolean rawSetBlock(Vector pt, BaseBlock block) {
         int y = pt.getBlockY();
+        int type = block.getType();
         
         if (y < 0 || y > 127) {
             return false;
         }
         
+        // No invalid blocks
+        if ((type > 25 && type < 35) || type == 36 || type > 92) {
+            return false;
+        }
+        
         int existing = world.getBlockType(pt);
 
         // Clear the container block so that it doesn't drop items