diff --git a/go/vt/topo/keyspace.go b/go/vt/topo/keyspace.go
index f04ddba308c..99ef738ba90 100755
--- a/go/vt/topo/keyspace.go
+++ b/go/vt/topo/keyspace.go
@@ -234,7 +234,7 @@ func (ts *Server) FindAllShardsInKeyspace(ctx context.Context, keyspace string)
 			if IsErrType(err, NoNode) {
 				log.Warningf("GetShard(%v, %v) returned ErrNoNode, consider checking the topology.", keyspace, shard)
 			} else {
-				vterrors.Wrapf(err, "GetShard(%v, %v) failed", keyspace, shard)
+				return nil, vterrors.Wrapf(err, "GetShard(%v, %v) failed", keyspace, shard)
 			}
 		}
 		result[shard] = si