diff --git a/plugins/Relay.py b/plugins/Relay.py
index a5647eb32..21989060e 100644
--- a/plugins/Relay.py
+++ b/plugins/Relay.py
@@ -261,15 +261,15 @@ class Relay(callbacks.Privmsg):
             
     def _formatPrivmsg(self, nick, abbreviation, msg):
         # colorize nicks
-        color_index = (hash(nick) % 14) + 2
-        color = ircutils._colors.keys()[color_index]
+        colorNumber = (hash(nick) % 14) + 2
         if ircmsgs.isAction(msg):
             return '* %s@%s %s' % \
-                   (ircutils.mircColor(nick, color), abbreviation,
+                   (ircutils.mircColor(nick, colorNumber), abbreviation,
                     ircmsgs.unAction(msg))
         else:
             return '<%s@%s> %s' % \
-                   (ircutils.mircColor(nick, color), abbreviation, msg.args[1])
+                   (ircutils.mircColor(nick, colorNumber),
+                    abbreviation, msg.args[1])
 
     def doPrivmsg(self, irc, msg):
         callbacks.Privmsg.doPrivmsg(self, irc, msg)
diff --git a/src/ircutils.py b/src/ircutils.py
index 00c1f0c8e..55f7a1a99 100644
--- a/src/ircutils.py
+++ b/src/ircutils.py
@@ -217,9 +217,11 @@ mircColors = {
     'light grey': '15',
 }
 
-# Now add the reverse to the dictionary.
 for (k, v) in mircColors.items():
-    mircColors[int(v)] = k
+    if v: # Ignore empty string for None.
+        i = int(v)
+        mircColors[v] = i
+        mircColors[i] = i
 
 def mircColor(s, fg=None, bg=None):
     """Returns s, with the appropriate mIRC color codes applied."""