diff --git a/discovery.go b/discovery.go
index 0a9d0ce..48b2922 100644
--- a/discovery.go
+++ b/discovery.go
@@ -68,7 +68,7 @@ func (c *rendezvousDiscovery) FindPeers(ctx context.Context, ns string, opts ...
 		return nil, err
 	}
 
-	const maxLimit = 1000
+	const maxLimit = 50
 	limit := options.Limit
 	if limit == 0 || limit > maxLimit {
 		limit = maxLimit
diff --git a/svc.go b/svc.go
index 759168b..448015a 100644
--- a/svc.go
+++ b/svc.go
@@ -172,7 +172,8 @@ func (rz *RendezvousService) handleRegister(p peer.ID, m *pb.Message_Register) *
 	mpid := mpi.GetId()
 	var mp peer.ID
 	if mpid != nil {
-		mp, err := peer.IDFromBytes(mpid)
+		var err error
+		mp, err = peer.IDFromBytes(mpid)
 		if err != nil {
 			return newRegisterResponseError(pb.Message_E_INVALID_PEER_INFO, "bad peer id")
 		}