diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
index e1a6d937..6b3f35fb 100644
--- a/src/main/java/org/bukkit/ChatColor.java
+++ b/src/main/java/org/bukkit/ChatColor.java
@@ -222,7 +222,7 @@ public enum ChatColor {
         int length = input.length();
 
         while ((lastIndex = input.indexOf(COLOR_CHAR, lastIndex + 1)) != -1) {
-            if (lastIndex != length) {
+            if (lastIndex < length - 1) {
                 char c = input.charAt(lastIndex + 1);
                 ChatColor col = getByChar(c);