From 1bd5c3c2e4a875771ffa7264c3c3441f80b32059 Mon Sep 17 00:00:00 2001
From: kablewi <kable.wilmoth@microfocus.com>
Date: Thu, 5 Jan 2017 00:06:16 -0800
Subject: [PATCH] Fixed Rocket.Chat crashes at startup if Slack bridge enabled
 and slack.com is not reachable #5426

---
 packages/rocketchat-slackbridge/slackbridge.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-slackbridge/slackbridge.js b/packages/rocketchat-slackbridge/slackbridge.js
index 76c81933170..47e653f2f43 100644
--- a/packages/rocketchat-slackbridge/slackbridge.js
+++ b/packages/rocketchat-slackbridge/slackbridge.js
@@ -56,7 +56,12 @@ class SlackBridge {
 				}
 			});
 			Meteor.startup(() => {
-				this.populateSlackChannelMap(); // If run outside of Meteor.startup, HTTP is not defined
+				try {
+					this.populateSlackChannelMap(); // If run outside of Meteor.startup, HTTP is not defined
+				} catch (err) {
+					logger.class.error('Error attempting to connect to Slack', err);
+					this.disconnect();
+				}
 			});
 		}
 	}