diff --git a/changelog b/changelog
index 9be048d3..7a58a285 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,7 @@
+Tue Sep 17 22:24 2013 CDT
+    * lib/user.js: Fix what I assume was a race condition that caused an error message
+      when a user's login callback fired after the channel unloaded.
+
 Tue Sep 17 13:16 2013 CDT
     * lib/get-info.js: Fix ustream for channels that have /channel/ in the
       path.
diff --git a/lib/user.js b/lib/user.js
index 6cb3b8e0..65cb3b7c 100644
--- a/lib/user.js
+++ b/lib/user.js
@@ -654,7 +654,7 @@ User.prototype.login = function(name, pw, session) {
                 });
                 return;
             }
-            if(self.channel != null) {
+            if(self.channel !== null && !self.channel.dead) {
                 for(var i = 0; i < self.channel.users.length; i++) {
                     if(self.channel.users[i].name.toLowerCase() == name.toLowerCase()) {
                         if (self.channel.users[i] == self) {