diff --git a/routing/dht/query.go b/routing/dht/query.go
index 1321b5193..c45fa239f 100644
--- a/routing/dht/query.go
+++ b/routing/dht/query.go
@@ -258,12 +258,15 @@ func (r *dhtQueryRunner) queryPeer(p peer.ID) {
 		r.Unlock()
 		r.cancel() // signal to everyone that we're done.
 
-	} else if res.closerPeers != nil {
-		log.Debugf("PEERS CLOSER -- worker for: %v", p)
+	} else if len(res.closerPeers) > 0 {
+		log.Debugf("PEERS CLOSER -- worker for: %v (%d closer peers)", p, len(res.closerPeers))
 		for _, next := range res.closerPeers {
 			// add their addresses to the dialer's peerstore
 			r.query.dialer.Peerstore().AddAddresses(next.ID, next.Addrs)
 			r.addPeerToQuery(next.ID, p)
+			log.Debugf("PEERS CLOSER -- worker for: %v added %v (%v)", p, next.ID, next.Addrs)
 		}
+	} else {
+		log.Debugf("QUERY worker for: %v - not found, and no closer peers.", p)
 	}
 }
diff --git a/routing/dht/routing.go b/routing/dht/routing.go
index 9a0620581..c515324c5 100644
--- a/routing/dht/routing.go
+++ b/routing/dht/routing.go
@@ -139,6 +139,7 @@ func (dht *IpfsDHT) FindProvidersAsync(ctx context.Context, key u.Key, count int
 
 func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key u.Key, count int, peerOut chan peer.PeerInfo) {
 	defer close(peerOut)
+	log.Debugf("%s FindProviders %s", dht.self, key)
 
 	ps := pset.NewLimited(count)
 	provs := dht.providers.GetProviders(ctx, key)