diff --git a/MobArena.jar b/MobArena.jar
index ad02a67..745c5d0 100644
Binary files a/MobArena.jar and b/MobArena.jar differ
diff --git a/resources/plugin.yml b/resources/plugin.yml
index 73fc2c4..0495962 100644
--- a/resources/plugin.yml
+++ b/resources/plugin.yml
@@ -1,22 +1,22 @@
 name: MobArena
 main: com.garbagemule.MobArena.MobArena
-version: 0.94.3.20
+version: 0.94.3.21
 softdepend: [Spout,Permissions,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells]
 commands:
     ma:
         description: Base command for MobArena
         usage: |
-            /ma join      - Join the arena.
-            /ma leave     - Leave the arena.
-            /ma notready  - List of players who aren't ready.
-            /ma spectate  - Warp to the spectator area.
+            YOU HAVE AN ERROR!
+            Find the error in your server log, copy it into
+            http://pastebin.com, and then paste the link
+            in the IRC or on the forums.
     mobarena:
         description: Base command for MobArena
         usage: |
-            /mobarena join      - Join the arena.
-            /mobarena leave     - Leave the arena.
-            /mobarena notready  - List of players who aren't ready.
-            /mobarena spectate  - Warp to the spectator area.
+            YOU HAVE AN ERROR!
+            Find the error in your server log, copy it into
+            http://pastebin.com, and then paste the link
+            in the IRC or on the forums.
 permissions:
     mobarena.use:
         description: Gives access to usage commands
diff --git a/src/com/garbagemule/MobArena/MACommands.java b/src/com/garbagemule/MobArena/MACommands.java
index 5061bf4..3bb0f81 100644
--- a/src/com/garbagemule/MobArena/MACommands.java
+++ b/src/com/garbagemule/MobArena/MACommands.java
@@ -102,10 +102,17 @@ public class MACommands implements CommandExecutor
         boolean console = (sender instanceof ConsoleCommandSender);
         
         // Cast the sender to Player if possible.
-        Player p = (player) ? (Player)sender : null;
+        Player p = (player) ? (Player) sender : null;
         
         if (args.length == 0)
-            return false;
+        {
+            List<Arena> arenas = am.getEnabledArenas();
+            if (arenas == null || arenas.isEmpty())
+                MAUtils.tellPlayer(p, "There are no enabled arenas to join!");
+            else
+                MAUtils.tellPlayer(p, "Use /ma join to join an arena.");
+            return true;
+        }
         
         // Grab the command base and any arguments.
         String base = args[0].toLowerCase();