Merge branch '2.4'

weaveworks · Sep 26, 2018 · a73330f · a73330f
2 parents fc759e2 + 427e7a6
commit a73330f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ipam/http.go b/ipam/http.go
@@ -199,6 +199,10 @@ func (alloc *Allocator) HandleHTTP(router *mux.Router, defaultSubnet address.CID
 	})
 
 	router.Methods("GET").Path("/ipinfo/tracker").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, alloc.tracker.String())
+		tracker := ""
+		if alloc.tracker != nil {
+			tracker = alloc.tracker.String()
+		}
+		fmt.Fprintf(w, tracker)
 	})
 }