diff --git a/static/chat/index.html b/static/chat/index.html
index c5d76a0..6ae4569 100755
--- a/static/chat/index.html
+++ b/static/chat/index.html
@@ -19,7 +19,7 @@
     <input id="chat-input" type="text" placeholder="say anything" autofocus/>
   </section>
 
-  <script src="///media.twiliocdn.com/sdk/js/chat/releases/0.11.0/twilio-chat.min.js"></script>
+  <script src="///media.twiliocdn.com/sdk/js/chat/v0.11/twilio-chat.js"></script>
   <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
   <script src="index.js"></script>
 </body>
diff --git a/static/chat/index.js b/static/chat/index.js
index 6cea9bd..5eb7d69 100755
--- a/static/chat/index.js
+++ b/static/chat/index.js
@@ -63,23 +63,21 @@ $(function() {
         var promise = chatClient.getChannelByUniqueName('general');
         promise.then(function(channel) {
             generalChannel = channel;
-            if (!generalChannel) {
-                // If it doesn't exist, let's create it
-                console.log('Creating general channel');
-                chatClient.createChannel({
-                    uniqueName: 'general',
-                    friendlyName: 'General Chat Channel'
-                }).then(function(channel) {
-                    console.log('Created general channel:');
-                    console.log(channel);
-                    generalChannel = channel;
-                    setupChannel();
-                });
-            } else {
-                console.log('Found general channel:');
-                console.log(generalChannel);
+            console.log('Found general channel:');
+            console.log(generalChannel);
+            setupChannel();
+        }).catch(function() {
+            // If it doesn't exist, let's create it
+            console.log('Creating general channel');
+            chatClient.createChannel({
+                uniqueName: 'general',
+                friendlyName: 'General Chat Channel'
+            }).then(function(channel) {
+                console.log('Created general channel:');
+                console.log(channel);
+                generalChannel = channel;
                 setupChannel();
-            }
+            });
         });
     }