From be6fa3da3dbc0f398146b07245eb77f7d4d73e5b Mon Sep 17 00:00:00 2001
From: "Jeff (Zhefu) Jiang" <jeffjiang@google.com>
Date: Thu, 30 Jul 2015 12:58:16 -0700
Subject: [PATCH] fix toposerver

---
 go/vt/vtgate/srv_topo_server.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/vt/vtgate/srv_topo_server.go b/go/vt/vtgate/srv_topo_server.go
index 50c0ce7edd1..81d866ea4b6 100644
--- a/go/vt/vtgate/srv_topo_server.go
+++ b/go/vt/vtgate/srv_topo_server.go
@@ -411,7 +411,7 @@ func (server *ResilientSrvTopoServer) GetEndPoints(ctx context.Context, cell, ke
 			server.endPointCounters.errors.Add(key, 1)
 			return
 		}
-		if len(result.Entries) == 0 {
+		if result == nil || len(result.Entries) == 0 {
 			server.endPointCounters.emptyResults.Add(key, 1)
 			return
 		}