diff --git a/src/main/java/com/graywolf336/jail/JailManager.java b/src/main/java/com/graywolf336/jail/JailManager.java
index de4af8e..071a5ae 100644
--- a/src/main/java/com/graywolf336/jail/JailManager.java
+++ b/src/main/java/com/graywolf336/jail/JailManager.java
@@ -179,6 +179,7 @@ public class JailManager {
 	 * @return The same object given
 	 */
 	public CachePrisoner addCacheObject(CachePrisoner cache) {
+		plugin.debug("Adding " + cache.getPrisoner().getUUID().toString() + " to the cache.");
 		this.cache.put(cache.getPrisoner().getUUID(), cache);
 		return cache;
 	}
@@ -209,6 +210,7 @@ public class JailManager {
 	 * @param uuid of the prisoner to remove
 	 */
 	public void removeCacheObject(UUID uuid) {
+		plugin.debug("Removing " + uuid.toString() + " from the cache.");
 		this.cache.remove(uuid);
 	}
 	
diff --git a/src/main/java/com/graywolf336/jail/beans/Jail.java b/src/main/java/com/graywolf336/jail/beans/Jail.java
index 129cbc7..0c1b82a 100644
--- a/src/main/java/com/graywolf336/jail/beans/Jail.java
+++ b/src/main/java/com/graywolf336/jail/beans/Jail.java
@@ -139,7 +139,7 @@ public class Jail {
 	
 	/** Removes a prisoner from this jail, doesn't remove it from the cell. */
 	public void removePrisoner(Prisoner p) {
-		this.nocellPrisoners.remove(p);
+		this.nocellPrisoners.remove(p.getUUID());
 	}
 	
 	/** Adds a cell to the Jail. */
diff --git a/src/main/java/com/graywolf336/jail/listeners/MoveProtectionListener.java b/src/main/java/com/graywolf336/jail/listeners/MoveProtectionListener.java
index 2c68108..df6c4c6 100644
--- a/src/main/java/com/graywolf336/jail/listeners/MoveProtectionListener.java
+++ b/src/main/java/com/graywolf336/jail/listeners/MoveProtectionListener.java
@@ -29,8 +29,8 @@ public class MoveProtectionListener implements Listener {
 		if(pl.getConfig().getBoolean(Settings.MOVEPROTECTION.getPath())) {
 			//Let's be sure the player we're dealing with is in jail
 			
-			CachePrisoner cp = pl.getJailManager().getCacheObject(event.getPlayer().getUniqueId());
-			if(cp != null) {
+			if(pl.getJailManager().inCache(event.getPlayer().getUniqueId())) {
+				CachePrisoner cp = pl.getJailManager().getCacheObject(event.getPlayer().getUniqueId());
 				Jail j = cp.getJail();
 				Prisoner p = cp.getPrisoner();