diff --git a/src/commands/general/CommandLeaderboard.java b/src/commands/general/CommandLeaderboard.java
index b461077..ddc8cf0 100644
--- a/src/commands/general/CommandLeaderboard.java
+++ b/src/commands/general/CommandLeaderboard.java
@@ -49,15 +49,25 @@ public class CommandLeaderboard extends Command
 				if(userID.length() < 1)
 					continue;
 				
-				// Look up in the database the user beans
-				String dbUserData = DatabaseManager.instance.globalGetRemoteValue(guildID + userID);
+				String dbUserData = null;
+				Long parsedBeans = null;
 				
-				// Leverage the fact that the user is automatically read and parsed when constructed.
-				Long parsedBeans = KittyUser.parseBeans(KittyUser.prepareFromString(dbUserData));
-				
-				// If we were only using cached users, we would use this. However, we're not.
-				// KittyUser cachedUser = ObjectBuilderFactory.getCachedUser(guildID, userID);
-				users.add(new Pair<Long, String>(parsedBeans, userID));
+				try
+				{
+					// Look up in the database the user beans
+					dbUserData = DatabaseManager.instance.globalGetRemoteValue(guildID + userID);
+					
+					// Leverage the fact that the user is automatically read and parsed when constructed.
+					parsedBeans = KittyUser.parseBeans(KittyUser.prepareFromString(dbUserData));
+					
+					// If we were only using cached users, we would use this. However, we're not.
+					// KittyUser cachedUser = ObjectBuilderFactory.getCachedUser(guildID, userID);
+					users.add(new Pair<Long, String>(parsedBeans, userID));
+				}
+				catch (Exception e)
+				{
+					GlobalLog.error(LogFilter.Command, "Issue parsing for leaderboard,\ndbUserData:" + dbUserData + "\nparsedBeans:" + parsedBeans);
+				}
 			}
 		}
 		
diff --git a/src/core/CommandManager.java b/src/core/CommandManager.java
index 5c7e599..ec831ee 100644
--- a/src/core/CommandManager.java
+++ b/src/core/CommandManager.java
@@ -11,14 +11,7 @@ import commands.mod.CommandModMain;
 import commands.music.CommandMusicMain;
 import commands.poll.CommandPollMain;
 import commands.raffle.CommandRaffleMain;
-import dataStructures.KittyChannel;
-import dataStructures.KittyGuild;
-import dataStructures.KittyRating;
-import dataStructures.KittyRole;
-import dataStructures.KittyUser;
-import dataStructures.Pair;
-import dataStructures.Response;
-import dataStructures.UserInput;
+import dataStructures.*;
 import utils.GlobalLog;
 import utils.LogFilter;
 
@@ -113,6 +106,7 @@ public class CommandManager
 		this.register(LocCommands.stub("raffle"), new CommandRaffleMain(KittyRole.General, KittyRating.Safe));
 		this.register(LocCommands.stub("poll"), new CommandPollMain(KittyRole.General, KittyRating.Safe));
 		this.register(LocCommands.stub("music"), new CommandMusicMain(KittyRole.General, KittyRating.Safe));
+		this.register(LocCommands.stub("defaultdance"), new CommandDefaultDance(KittyRole.General, KittyRating.Safe));
 	}
 	
 	// Allows the command manager to keep track of a command. Takes a pair (the un-localized and localzied commands)