diff --git a/Changelog.txt b/Changelog.txt
index 86c6c8744..23862359d 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -14,7 +14,8 @@ Version 1.3.10-dev
  + Added 50% & 150% XP boost perks
  = Fixed players never being removed from memory (memory leak)
  = Fixed admin chat being seen by everyone
- = Fixed issue with UTFDataFormatException occurring on occasion when trying to load Chunklets
+ = Fixed issue with UTFDataFormatException occurring on occasion when trying to load Chunklets
+ = Fixed ArrayIndexOutOfBounds error caused when trying to use /xplock after logging in but before gaining XP
 
 Version 1.3.09
  + Added compatibility with AntiCheat (Which I highly recommend to prevent cheating)
diff --git a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
index cb2b43e0f..57751c4ba 100644
--- a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
@@ -52,6 +52,10 @@ public class XplockCommand implements CommandExecutor {
                 player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(lastGained.toString()) }));
                 return true;
             }
+            else {
+                player.sendMessage(usage);
+                return true;
+            }
 
         case 1:
             if (Skills.isSkill(args[0])) {