diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java
index 1e591c1..f51ccc3 100644
--- a/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java
@@ -57,8 +57,8 @@
                 + "quote can be checked for by surrounding the word in double quotation marks (\"). \n");
         for(Command cmd: children)
         {
-            sb.append("\n`").append(Constants.PREFIX).append(name).append(" ").append(cmd.getName()).append(" ")
-                    .append(cmd.getArguments()).append("` - ").append(cmd.getHelp());
+            sb.append("\n`").append(Constants.PREFIX).append(name).append(" ").append(cmd.getName())
+                    .append(cmd.getArguments() == null ? "" : " " + cmd.getArguments()).append("` - ").append(cmd.getHelp());
         }
         event.reply(sb.toString());
     }
diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java
index e5238f9..42e92da 100644
--- a/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java
@@ -21,7 +21,6 @@
 import java.util.regex.Pattern;
 import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.vortex.Vortex;
-import com.jagrosh.vortex.commands.CommandExceptionListener;
 import com.jagrosh.vortex.commands.CommandExceptionListener.CommandErrorException;
 import com.jagrosh.vortex.commands.CommandExceptionListener.CommandWarningException;
 import com.jagrosh.vortex.commands.ModCommand;
diff --git a/src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java b/src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java
index eaff753..c697d3f 100644
--- a/src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java
+++ b/src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java
@@ -33,7 +33,8 @@
  */
 public class FilterManager extends DataManager
 {
-    private static final String SETTINGS_TITLE = "\uD83D\uDEAF Filters"; // 🚯
+    private final static int MAX_FILTERS = 15;
+    private final static String SETTINGS_TITLE = "\uD83D\uDEAF Filters"; // 🚯
     
     public final static SQLColumn<Long> GUILD_ID = new LongColumn("GUILD_ID",false,0L);
     public final static SQLColumn<String> SHORTNAME = new StringColumn("SHORTNAME",false,"",Filter.MAX_NAME_LENGTH);
@@ -93,6 +94,8 @@
         String shortname = shortnameOf(filter.name);
         if(shortname.isEmpty())
             return false;
+        if(getFilters(guild).size() >= MAX_FILTERS)
+            return false;
         invalidateCache(guild);
         return readWrite(selectAll(GUILD_ID.is(guild.getId()) + " AND " + SHORTNAME.is("'"+shortname+"'")), rs -> 
         {