diff --git a/router/gossip.go b/router/gossip.go
index baaeb1b5..f8d026ae 100644
--- a/router/gossip.go
+++ b/router/gossip.go
@@ -92,6 +92,11 @@ func (router *Router) NewGossip(channelName string, g Gossiper) Gossip {
 	return channel
 }
 
+func (router *Router) gossipChannel(channelName string) (*GossipChannel, bool) {
+	channel, found := router.GossipChannels[channelName]
+	return channel, found
+}
+
 func (router *Router) SendAllGossip() {
 	for _, channel := range router.GossipChannels {
 		if gossip := channel.gossiper.Gossip(); gossip != nil {
diff --git a/router/gossip_channel.go b/router/gossip_channel.go
index 31fa06ed..fdc7c5ed 100644
--- a/router/gossip_channel.go
+++ b/router/gossip_channel.go
@@ -37,7 +37,7 @@ func (router *Router) handleGossip(tag ProtocolTag, payload []byte) error {
 	if err := decoder.Decode(&channelName); err != nil {
 		return err
 	}
-	channel, found := router.GossipChannels[channelName]
+	channel, found := router.gossipChannel(channelName)
 	if !found {
 		return fmt.Errorf("[gossip] received unknown channel with name %s", channelName)
 	}