diff --git a/bridge/bridge.go b/bridge/bridge.go
index 312792b6..12fb71d7 100644
--- a/bridge/bridge.go
+++ b/bridge/bridge.go
@@ -84,8 +84,14 @@ func New(cfg *config.Config, bridge *config.Bridge, c chan config.Message) *Brid
 
 func (b *Bridge) JoinChannels() error {
 	exists := make(map[string]bool)
-	b.joinChannels(b.ChannelsIn, exists)
-	b.joinChannels(b.ChannelsOut, exists)
+	err := b.joinChannels(b.ChannelsIn, exists)
+	if err != nil {
+		return err
+	}
+	err = b.joinChannels(b.ChannelsOut, exists)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -99,7 +105,10 @@ func (b *Bridge) joinChannels(cMap map[string]config.ChannelOptions, exists map[
 				log.Debugf("using key %s for channel %s", info.Key, channel)
 				mychannel = mychannel + " " + info.Key
 			}
-			b.JoinChannel(mychannel)
+			err := b.JoinChannel(mychannel)
+			if err != nil {
+				return err
+			}
 			exists[channel] = true
 		}
 	}
diff --git a/gateway/gateway.go b/gateway/gateway.go
index 254fb89f..1f5c361f 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -48,7 +48,10 @@ func (gw *Gateway) AddBridge(cfg *config.Bridge) error {
 	if err != nil {
 		return fmt.Errorf("Bridge %s failed to start: %v", br.Account, err)
 	}
-	br.JoinChannels()
+	err = br.JoinChannels()
+	if err != nil {
+		return fmt.Errorf("Bridge %s failed to join channel: %v", br.Account, err)
+	}
 	return nil
 }