diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
index 2eda0ebc..df4f1eba 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
@@ -47,6 +47,11 @@ public class Command_cage extends FreedomCommand
         }
 
         final FPlayer fPlayer = plugin.pl.getPlayer(player);
+        if (fPlayer.getCageData().isCaged())
+        {
+            sender.sendMessage(ChatColor.RED + "That player is already caged.");
+            return true;
+        }
 
         Material outerMaterial = Material.GLASS;
         Material innerMaterial = Material.AIR;
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_uncage.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_uncage.java
index d218d570..9892067e 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_uncage.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_uncage.java
@@ -30,18 +30,15 @@ public class Command_uncage extends FreedomCommand
         }
 
         final FPlayer fPlayer = plugin.pl.getPlayer(player);
-
         if (fPlayer.getCageData().isCaged())
         {
-            FUtil.adminAction(sender.getName(), "Uncaging " + sender.getName(), true);
-            final FPlayer playerdata = plugin.pl.getPlayer(playerSender);
-            playerdata.getCageData().setCaged(false);
+            FUtil.adminAction(sender.getName(), "Uncaging " + player.getName(), true);
+            fPlayer.getCageData().setCaged(false);
         }
         else
         {
             msg("That player is not caged!", ChatColor.RED);
         }
-
         return true;
     }
 }