1 files changed, 6 insertions, 4 deletions

diff --git a/app/xmpp/msg-processors/room-join.js b/app/xmpp/msg-processors/room-join.js
index 09dd56e..9233c0d 100644
--- a/app/xmpp/msg-processors/room-join.js
+++ b/app/xmpp/msg-processors/room-join.js
@@ -36,8 +36,7 @@ module.exports = MessageProcessor.extend({
         var toParts = this.request.attrs.to.split('/'),
             roomUrl = toParts[0],
             nickname = toParts[1],
-            roomSlug = roomUrl.split('@')[0],
-            connection = this.client.conn;
+            roomSlug = roomUrl.split('@')[0];
 
         this.connection.nickname(roomSlug, nickname);
 
@@ -97,7 +96,7 @@ module.exports = MessageProcessor.extend({
         });
 
         presence.c('x', {
-            xmlns:'http://jabber.org/protocol/muc'
+            xmlns: 'http://jabber.org/protocol/muc'
         });
 
         presence.c('error', {
@@ -188,7 +187,7 @@ module.exports = MessageProcessor.extend({
 
             presence
                 .c('x', {
-                    xmlns:'http://jabber.org/protocol/muc#user'
+                    xmlns: 'http://jabber.org/protocol/muc#user'
                 })
                 .c('item', {
                     jid: this.connection.getUserJid(username),
@@ -241,6 +240,9 @@ module.exports = MessageProcessor.extend({
         }
 
         this.core.messages.list(query, function(err, messages) {
+            if (err) {
+                return cb(err);
+            }
 
             messages.reverse();