diff --git a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java
index 8cbce1c16..43233dbf9 100644
--- a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java
+++ b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java
@@ -199,7 +199,7 @@ public class NPCCommands {
         }
 
         npc = npcRegistry.createNPC(type, name);
-        String msg = "You created " + StringHelper.wrap(npc.getName()) + " at your location";
+        String msg = "You created [[" + npc.getName() + "]] at your location";
 
         int age = 0;
         if (args.hasFlag('b')) {
diff --git a/src/main/java/net/citizensnpcs/util/Messaging.java b/src/main/java/net/citizensnpcs/util/Messaging.java
index 9c5ef1538..5bfe62af9 100644
--- a/src/main/java/net/citizensnpcs/util/Messaging.java
+++ b/src/main/java/net/citizensnpcs/util/Messaging.java
@@ -55,10 +55,14 @@ public class Messaging {
             String trimmed = message.trim();
             String messageColour = StringHelper.parseColors(Setting.MESSAGE_COLOUR.asString());
             if (!trimmed.isEmpty()) {
-                if (trimmed.charAt(0) != ChatColor.COLOR_CHAR)
-                    message = StringHelper.parseColors(Setting.MESSAGE_COLOUR.asString()) + message;
-                else
-                    messageColour = ChatColor.getByChar(message.substring(1, 2)).toString();
+                if (trimmed.charAt(0) == ChatColor.COLOR_CHAR) {
+                    ChatColor test = ChatColor.getByChar(trimmed.substring(1, 2));
+                    if (test == null) {
+                        message = messageColour + message;
+                    } else
+                        messageColour = test.toString();
+                } else
+                    message = messageColour + message;
             }
             message = message.replace("[[", StringHelper.parseColors(Setting.HIGHLIGHT_COLOUR.asString()));
             message = message.replace("]]", messageColour);