diff --git a/pom.xml b/pom.xml
index f5257ba..f8e3766 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>1.5-R0.1-SNAPSHOT</version>
+			<version>1.6.1-R0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java b/src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java
index 4545617..fd267f1 100644
--- a/src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java
+++ b/src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java
@@ -46,14 +46,14 @@ public class ToolListener implements Listener
 			final Tool tool = toolsByType.get(type);
 			final Player player = event.getPlayer();
 			if (tool != null && (action == Action.RIGHT_CLICK_BLOCK || action == Action.LEFT_CLICK_BLOCK) && logblock.hasPermission(player, "logblock.tools." + tool.name)) {
-				if (!isLogged(player.getWorld())) {
-					player.sendMessage(ChatColor.RED + "This world is not currently logged.");
-					event.setCancelled(true);
-					return;
-				}
 				final ToolBehavior behavior = action == Action.RIGHT_CLICK_BLOCK ? tool.rightClickBehavior : tool.leftClickBehavior;
 				final ToolData toolData = getSession(player).toolData.get(tool);
 				if (behavior != ToolBehavior.NONE && toolData.enabled) {
+					if (!isLogged(player.getWorld())) {
+						player.sendMessage(ChatColor.RED + "This world is not currently logged.");
+						event.setCancelled(true);
+						return;
+					}
 					final Block block = event.getClickedBlock();
 					final QueryParams params = toolData.params;
 					params.loc = null;
diff --git a/src/main/java/de/diddiz/util/BukkitUtils.java b/src/main/java/de/diddiz/util/BukkitUtils.java
index 6032977..b3c7041 100644
--- a/src/main/java/de/diddiz/util/BukkitUtils.java
+++ b/src/main/java/de/diddiz/util/BukkitUtils.java
@@ -60,7 +60,7 @@ public class BukkitUtils
 		relativeBreakable.add(Material.COCOA);
 
 		// Blocks that break when they are on top of a block
-		relativeTopBreakable = new HashSet<Material>(31);
+		relativeTopBreakable = new HashSet<Material>(32);
 		relativeTopBreakable.add(Material.SAPLING);
 		relativeTopBreakable.add(Material.LONG_GRASS);
 		relativeTopBreakable.add(Material.DEAD_BUSH);
@@ -92,6 +92,7 @@ public class BukkitUtils
 		relativeTopBreakable.add(Material.REDSTONE_COMPARATOR_OFF);
 		relativeTopBreakable.add(Material.WOODEN_DOOR);
 		relativeTopBreakable.add(Material.IRON_DOOR);
+		relativeTopBreakable.add(Material.CARPET);
 
 		// Blocks that fall
 		relativeTopFallables = new HashSet<Material>(4);
@@ -101,7 +102,7 @@ public class BukkitUtils
 		relativeTopFallables.add(Material.ANVIL);
 
 		// Blocks that break falling entities
-		fallingEntityKillers = new HashSet<Material>(31);
+		fallingEntityKillers = new HashSet<Material>(32);
 		fallingEntityKillers.add(Material.SIGN_POST);
 		fallingEntityKillers.add(Material.WALL_SIGN);
 		fallingEntityKillers.add(Material.STONE_PLATE);
@@ -133,6 +134,7 @@ public class BukkitUtils
 		fallingEntityKillers.add(Material.REDSTONE_COMPARATOR_ON);
 		fallingEntityKillers.add(Material.REDSTONE_COMPARATOR_OFF);
 		fallingEntityKillers.add(Material.DAYLIGHT_DETECTOR);
+		fallingEntityKillers.add(Material.CARPET);
 
 		// Crop Blocks
 		cropBlocks = new HashSet<Material>(5);