diff --git a/src/com/massivecraft/massivecore/MassiveCoreEngineCommandRegistration.java b/src/com/massivecraft/massivecore/MassiveCoreEngineCommandRegistration.java
index e60ab4ae..ee3a7fe5 100644
--- a/src/com/massivecraft/massivecore/MassiveCoreEngineCommandRegistration.java
+++ b/src/com/massivecraft/massivecore/MassiveCoreEngineCommandRegistration.java
@@ -109,8 +109,8 @@ public class MassiveCoreEngineCommandRegistration extends EngineAbstract
 			MassiveCoreBukkitCommand command = new MassiveCoreBukkitCommand(name, target);
 			
 			// ... and finally register it.
-			Plugin plugin = massiveCurrent.getRegisteredPlugin();
-			String pluginName = plugin != null ? plugin.getName() : "MassiveCore";
+			Plugin plugin = command.getPlugin();
+			String pluginName = (plugin != null ? plugin.getName() : "MassiveCore");
 			simpleCommandMap.register(pluginName, command);
 		}
 		
diff --git a/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java b/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java
index 662c29cb..61a4abbf 100644
--- a/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java
+++ b/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java
@@ -1,6 +1,7 @@
 package com.massivecraft.massivecore.collections;
 
 import org.bukkit.World;
+import org.bukkit.entity.Entity;
 
 import com.massivecraft.massivecore.CaseInsensitiveComparator;
 
@@ -28,5 +29,10 @@ public class WorldExceptionSet
 	{
 		return this.contains(world.getName());
 	}
+	
+	public boolean contains(Entity entity)
+	{
+		return this.contains(entity.getWorld());
+	}
 
 }