diff --git a/pom.xml b/pom.xml
index 8e1482c..eaf9975 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>eu.endermite</groupId>
     <artifactId>CommandWhitelist</artifactId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <packaging>jar</packaging>
 
     <name>CommandWhitelist</name>
diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java
index 9237405..0d29a4c 100644
--- a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java
+++ b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java
@@ -22,10 +22,12 @@ public void onCommandTabComplete(org.bukkit.event.server.TabCompleteEvent event)
             String slast = CommandsList.getLastArgument(s);
             String scommand = s.replace(slast, "");
             cmd = cmd.replace(CommandsList.getLastArgument(cmd), "");
-            if (cmd.startsWith("/"+scommand+" ")) {
+            if (cmd.startsWith("/" + scommand + " ")) {
                 continue;
             }
-            suggestions.remove(slast);
+            try {
+                suggestions.remove(slast);
+            } catch (Exception ignored) {}
         }
         event.setCompletions(suggestions);
     }