diff --git a/routing/dht/dht.go b/routing/dht/dht.go
index a0f14aa91..5068717e7 100644
--- a/routing/dht/dht.go
+++ b/routing/dht/dht.go
@@ -272,7 +272,7 @@ func (dht *IpfsDHT) getValueOrPeers(ctx context.Context, p peer.Peer,
 	// Perhaps we were given closer peers
 	var peers []peer.Peer
 	for _, pb := range pmes.GetCloserPeers() {
-		pr, err := dht.addPeer(pb)
+		pr, err := dht.ensureConnectedToPeer(pb)
 		if err != nil {
 			log.Error("%s", err)
 			continue
diff --git a/routing/dht/handlers.go b/routing/dht/handlers.go
index d3c4d23e3..fce25454c 100644
--- a/routing/dht/handlers.go
+++ b/routing/dht/handlers.go
@@ -48,10 +48,10 @@ func (dht *IpfsDHT) handleGetValue(p peer.Peer, pmes *Message) (*Message, error)
 	}
 
 	// let's first check if we have the value locally.
-	log.Debug("%s handleGetValue looking into ds\n", dht.self)
+	log.Debug("%s handleGetValue looking into ds", dht.self)
 	dskey := u.Key(pmes.GetKey()).DsKey()
 	iVal, err := dht.datastore.Get(dskey)
-	log.Debug("%s handleGetValue looking into ds GOT %v\n", dht.self, iVal)
+	log.Debug("%s handleGetValue looking into ds GOT %v", dht.self, iVal)
 
 	// if we got an unexpected error, bail.
 	if err != nil && err != ds.ErrNotFound {
@@ -63,7 +63,7 @@ func (dht *IpfsDHT) handleGetValue(p peer.Peer, pmes *Message) (*Message, error)
 
 	// if we have the value, send it back
 	if err == nil {
-		log.Debug("%s handleGetValue success!\n", dht.self)
+		log.Debug("%s handleGetValue success!", dht.self)
 
 		byts, ok := iVal.([]byte)
 		if !ok {
@@ -85,6 +85,9 @@ func (dht *IpfsDHT) handleGetValue(p peer.Peer, pmes *Message) (*Message, error)
 	if closer != nil {
 		for _, p := range closer {
 			log.Debug("handleGetValue returning closer peer: '%s'", p)
+			if len(p.Addresses()) < 1 {
+				log.Error("no addresses on peer being sent!")
+			}
 		}
 		resp.CloserPeers = peersToPBPeers(closer)
 	}