From d01ea9d6fbe479778d5378bb43cf713e4afdb909 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Sun, 27 Mar 2016 11:37:43 +0000
Subject: [PATCH] lib/discovery: Handle nil relayService (fixes #2890)

---
 lib/discover/local.go | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/discover/local.go b/lib/discover/local.go
index 8ae0079b0..816523c06 100644
--- a/lib/discover/local.go
+++ b/lib/discover/local.go
@@ -124,13 +124,15 @@ func (c *localClient) announcementPkt() Announce {
 	}
 
 	var relays []Relay
-	for _, relay := range c.relayStat.Relays() {
-		latency, ok := c.relayStat.RelayStatus(relay)
-		if ok {
-			relays = append(relays, Relay{
-				URL:     relay,
-				Latency: int32(latency / time.Millisecond),
-			})
+	if c.relayStat != nil {
+		for _, relay := range c.relayStat.Relays() {
+			latency, ok := c.relayStat.RelayStatus(relay)
+			if ok {
+				relays = append(relays, Relay{
+					URL:     relay,
+					Latency: int32(latency / time.Millisecond),
+				})
+			}
 		}
 	}