diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rollback.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rollback.java
index 838b9b4..f6fbe59 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rollback.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rollback.java
@@ -14,6 +14,11 @@ public class Command_rollback extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+        if (args.length == 0 || args.length > 2)
+        {
+            return false;
+        }
+
         if (args.length == 1)
         {
             if ("purgeall".equalsIgnoreCase(args[0]))
@@ -40,8 +45,10 @@ public class Command_rollback extends TFM_Command
                 playerMsg("Rolled back " + TFM_RollbackManager.rollback(playerName) + " edits for " + playerName + ".");
                 playerMsg("If this rollback was a mistake, use /rollback undo " + playerName + " within 40 seconds to reverse the rollback.");
             }
+            return true;
         }
-        else if (args.length == 2)
+
+        if (args.length == 2)
         {
             if ("purge".equalsIgnoreCase(args[0]))
             {
@@ -54,8 +61,10 @@ public class Command_rollback extends TFM_Command
                 }
 
                 playerMsg("Purged " + TFM_RollbackManager.purgeEntries(playerName) + " rollback history entries for " + playerName + ".");
+                return true;
             }
-            else if ("undo".equalsIgnoreCase(args[0]))
+
+            if ("undo".equalsIgnoreCase(args[0]))
             {
                 String playerName = getPlayerName(args[1]);
 
@@ -67,18 +76,11 @@ public class Command_rollback extends TFM_Command
 
                 TFM_Util.adminAction(sender.getName(), "Reverting rollback for player: " + playerName, false);
                 playerMsg("Reverted " + TFM_RollbackManager.undoRollback(playerName) + " edits for " + playerName + ".");
+                return true;
             }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return false;
         }
 
-        return true;
+        return false;
     }
 
     private String getPlayerName(String playerNameInput)