diff --git a/src/com/projectkorra/projectkorra/hooks/WorldGuardFlag.java b/src/com/projectkorra/projectkorra/hooks/WorldGuardFlag.java
index 0614adda..ff055f89 100644
--- a/src/com/projectkorra/projectkorra/hooks/WorldGuardFlag.java
+++ b/src/com/projectkorra/projectkorra/hooks/WorldGuardFlag.java
@@ -2,7 +2,6 @@ package com.projectkorra.projectkorra.hooks;
 
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.flags.registry.FlagConflictException;
 import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
 
 import com.projectkorra.projectkorra.ProjectKorra;
@@ -12,8 +11,8 @@ public class WorldGuardFlag {
 		final FlagRegistry registry = WorldGuard.getInstance().getFlagRegistry();
 		try {
 			registry.register(new StateFlag("bending", false));
-		} catch (final FlagConflictException e) {
-			ProjectKorra.log.severe("unable to register bending WorldGuard Flag");
+		} catch (final Exception e) {
+			ProjectKorra.log.severe("Unable to register bending WorldGuard Flag");
 		}
 	}
 }
diff --git a/src/com/projectkorra/projectkorra/util/TempBlock.java b/src/com/projectkorra/projectkorra/util/TempBlock.java
index b64e26e1..077c31f6 100644
--- a/src/com/projectkorra/projectkorra/util/TempBlock.java
+++ b/src/com/projectkorra/projectkorra/util/TempBlock.java
@@ -58,7 +58,7 @@ public class TempBlock {
 			instances.put(block, temp);
 		} else {
 			this.state = block.getState();
-			if (this.state instanceof Container) {
+			if (this.state instanceof Container || this.state.getType() == Material.JUKEBOX) {
 				return;
 			}
 			instances.put(block, this);