From 8f262241595cc9377e4c3adce9c728eaff38c5f3 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 16 Feb 2017 09:38:24 -0500
Subject: Fix JS error on joining some channels (#5439)

---
 webapp/routes/route_team.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webapp')

diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx
index 44a8c1eb6..b4d9e068a 100644
--- a/webapp/routes/route_team.jsx
+++ b/webapp/routes/route_team.jsx
@@ -34,7 +34,7 @@ function doChannelChange(state, replace, callback) {
     } else {
         channel = ChannelStore.getByName(state.params.channel);
 
-        if (channel.type === Constants.DM_CHANNEL) {
+        if (channel && channel.type === Constants.DM_CHANNEL) {
             loadNewDMIfNeeded(Utils.getUserIdFromChannelName(channel));
         }
 
-- 
cgit v1.2.3-1-g7c22