diff --git a/src/org/mcteam/factions/Factions.java b/src/org/mcteam/factions/Factions.java
index 2d69fb24..9c07e0c1 100644
--- a/src/org/mcteam/factions/Factions.java
+++ b/src/org/mcteam/factions/Factions.java
@@ -95,7 +95,7 @@ public class Factions extends JavaPlugin {
 		log("=== INIT START ===");
 		long timeInitStart = System.currentTimeMillis();
 		
-		log("asdfasdas"+MiscUtil.range(-1, 1));
+//		log("asdfasdas"+MiscUtil.range(-1, 1));
 		
 		// Add the commands
 		commands.add(new FCommandHelp());
diff --git a/src/org/mcteam/factions/listeners/FactionsPlayerListener.java b/src/org/mcteam/factions/listeners/FactionsPlayerListener.java
index 0f1bbef8..50392263 100644
--- a/src/org/mcteam/factions/listeners/FactionsPlayerListener.java
+++ b/src/org/mcteam/factions/listeners/FactionsPlayerListener.java
@@ -65,9 +65,13 @@ public class FactionsPlayerListener extends PlayerListener{
 		if ( ! Conf.chatTagEnabled) {
 			return;
 		}
-		
-		String formatStart = event.getFormat().substring(0, Conf.chatTagInsertIndex);
-		String formatEnd = event.getFormat().substring(Conf.chatTagInsertIndex);
+
+		int InsertIndex = Conf.chatTagInsertIndex;
+		if (InsertIndex > event.getFormat().length())
+			return;
+
+		String formatStart = event.getFormat().substring(0, InsertIndex);
+		String formatEnd = event.getFormat().substring(InsertIndex);
 		
 		String nonColoredMsgFormat = formatStart + me.getChatTag() + formatEnd;