diff --git a/bot.py b/bot.py
index 9ecbe19..c28b82d 100755
--- a/bot.py
+++ b/bot.py
@@ -446,6 +446,8 @@ class Fulvia(irc.IRCClient):
 		line = "-!- {oldname} is now known as {newname}"
 
 		for channel_name, channel in self.channels.items():
+			if oldname not in channel.users.keys():
+				continue
 			self.log(channel_name, line)
 
 			user = channel.users.pop(oldname)