From 4022ab5ce0b8f8480ea2a6fb32d68422aa17e90e Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Tue, 30 Jun 2015 07:59:31 -0700
Subject: [PATCH] Added extra precaution to avoid null error

---
 web/react/components/channel_header.jsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index cd1fb225af..48cb4d13bf 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -46,13 +46,15 @@ var ExtraMembers = React.createClass({
         var data_content = "";
         var sortedMembers = this.props.members;
 
-        sortedMembers.sort(function(a,b) {
-            return a.username.localeCompare(b.username);
-        })
+        if(sortedMembers) {
+            sortedMembers.sort(function(a,b) {
+                return a.username.localeCompare(b.username);
+            })
 
-        sortedMembers.forEach(function(m) {
-            data_content += "<div style='white-space: nowrap'>" + m.username + "</div>";
-        });
+            sortedMembers.forEach(function(m) {
+                data_content += "<div style='white-space: nowrap'>" + m.username + "</div>";
+            });
+        }
 
         return (
             <div style={{"cursor" : "pointer"}} id="member_popover" data-toggle="popover" data-content={data_content} data-original-title="Members" >