diff --git a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar
index 6766be0c..23fceed4 100644
Binary files a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar and b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar differ
diff --git a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.md5 b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.md5
index c587ad54..fa8fdbde 100644
--- a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.md5
+++ b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.md5
@@ -1 +1 @@
-3b1334c41e3a7fab70a4b9dedf3d2d6a
\ No newline at end of file
+fb34817f516246a314b3587e1e3ef368
\ No newline at end of file
diff --git a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.sha1 b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.sha1
index ee6448a8..004ad650 100644
--- a/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.sha1
+++ b/mvn-repo/com/massivecraft/Factions/1.6.9.5-U0.2.1-RC-1.5-BETA/Factions-1.6.9.5-U0.2.1-RC-1.5-BETA.jar.sha1
@@ -1 +1 @@
-9f456511cf3dddd2d238d9f12e3ebc0dc00e02f8
\ No newline at end of file
+5eed96da160209b291ea2f058c68a38b47673780
\ No newline at end of file
diff --git a/mvn-repo/com/massivecraft/Factions/maven-metadata.xml b/mvn-repo/com/massivecraft/Factions/maven-metadata.xml
index 1a5a3743..646fe7f7 100644
--- a/mvn-repo/com/massivecraft/Factions/maven-metadata.xml
+++ b/mvn-repo/com/massivecraft/Factions/maven-metadata.xml
@@ -3,10 +3,11 @@
   <groupId>com.massivecraft</groupId>
   <artifactId>Factions</artifactId>
   <versioning>
-    <release>1.6.9.5-U0.2.1-RC-1.5-BETA</release>
+    <release>1.6.9.5-U0.2.1-RC-1.5-BETA-2</release>
     <versions>
       <version>1.6.9.5-U0.2.1-RC-1.5-BETA</version>
+      <version>1.6.9.5-U0.2.1-RC-1.5-BETA-2</version>
     </versions>
-      <lastUpdated>20181220220357</lastUpdated>
+    <lastUpdated>20181221181311</lastUpdated>
   </versioning>
 </metadata>
diff --git a/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.md5 b/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.md5
index 4050806a..9b8faef8 100644
--- a/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.md5
+++ b/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.md5
@@ -1 +1 @@
-2446c2ce3e973dde08e0d246410e2cd0
\ No newline at end of file
+9bdc33366d81ebbb51cec5b2a0092585
\ No newline at end of file
diff --git a/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.sha1 b/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.sha1
index fd06071c..d9f14fac 100644
--- a/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.sha1
+++ b/mvn-repo/com/massivecraft/Factions/maven-metadata.xml.sha1
@@ -1 +1 @@
-fc6e25aaeb2ec2b3581075cd2bfc657ada82045d
\ No newline at end of file
+cdb7b8ec048405faa43f32d2daf226382f5952d2
\ No newline at end of file
diff --git a/src/main/java/com/massivecraft/factions/SavageFactions.java b/src/main/java/com/massivecraft/factions/SavageFactions.java
index 30361710..a41b0080 100644
--- a/src/main/java/com/massivecraft/factions/SavageFactions.java
+++ b/src/main/java/com/massivecraft/factions/SavageFactions.java
@@ -506,7 +506,12 @@ public class SavageFactions extends MPlugin {
     }
     
     @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args){
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+       FPlayer fPlayer = FPlayers.getInstance().getByPlayer((Player) sender);
+       if (!fPlayer.hasFaction()) {
+          fPlayer.msg("Autocomplete is not available if you do not have a faction.");
+          return new ArrayList<String>();
+       }
     	List<String> completions = new ArrayList<>();
     	String cmd = Conf.baseCommandAliases.isEmpty() ? "/f" : "/" + Conf.baseCommandAliases.get(0);
     	List<String> argsList = new ArrayList<>(Arrays.asList(args));
@@ -521,7 +526,7 @@ public class SavageFactions extends MPlugin {
     		MCommand<?> commandFounded = commandsList.stream()
     				.filter(c -> c.aliases.contains(cmdName))
     				.findFirst().orElse(null);
-        	
+
         	if (commandFounded != null)
         	{
         		commandEx = commandFounded;