From 10de5df3c6f90e8f536822bda9b111bca115d23f Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 17 Dec 2013 23:07:01 -0500
Subject: [PATCH] Minor bugfixes

---
 lib/channel.js | 10 ++++++++++
 lib/server.js  |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/channel.js b/lib/channel.js
index 6cb073be..be089cf4 100644
--- a/lib/channel.js
+++ b/lib/channel.js
@@ -818,6 +818,10 @@ Channel.prototype.addPendingJoin = function (user, password) {
 
 Channel.prototype.handlePendingJoins = function () {
     var self = this;
+    if (self.dead) {
+        return;
+    }
+
     self.pendingJoins.forEach(function (u) {
         self.userJoin(u.user, u.pw);
     });
@@ -871,6 +875,12 @@ Channel.prototype.userJoin = function(user, password) {
 
     // Prevent duplicate login
     if(user.name != "") {
+        if (this.users === undefined) {
+            Logger.errlog.log("Wat: this.users is undefined");
+            Logger.errlog.log("chan: " + this.name + ", dead: " + this.dead);
+            Logger.errlog.log("keys: " + Object.keys(this).join(","));
+            return;
+        }
         for(var i = 0; i < this.users.length; i++) {
             if(this.users[i].name.toLowerCase() == user.name.toLowerCase()) {
                 if (this.users[i] == user) {
diff --git a/lib/server.js b/lib/server.js
index d07b9138..550e90e8 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -121,7 +121,7 @@ var Server = function (cfg) {
                                           "path-traversal",
                                           req.url);
                 } else if (e.status >= 500) {
-                    Logger.errlog.log(err);
+                    Logger.errlog.log(e);
                 }
                 res.send(e.status);
             } else {