diff --git a/api.go b/api.go
index d913ea4ae..f3a9b5cac 100644
--- a/api.go
+++ b/api.go
@@ -965,13 +965,18 @@ func (api *API) requestUsageOfNodes() {
 		if node.ID == api.server.nodeID {
 			continue
 		}
+
+		fmt.Printf("Node URI: %v\n", node.URI)
+		if node.URI.Scheme == "" || node.URI.Host == "" {
+			continue
+		}
 		nodeUsage, err := api.server.defaultClient.GetNodeUsage(context.Background(), &node.URI)
 		if err != nil {
 			api.server.logger.Infof("couldn't collect disk usage from %s: %s", node.URI, err)
 		}
 		api.usageCache.muRead.Lock()
-		defer api.usageCache.muRead.Unlock()
 		api.usageCache.data[node.ID] = nodeUsage[node.ID]
+		api.usageCache.muRead.Unlock()
 	}
 }
 
diff --git a/server/handler_test.go b/server/handler_test.go
index a6afffccf..865cfd5dc 100644
--- a/server/handler_test.go
+++ b/server/handler_test.go
@@ -516,9 +516,11 @@ func TestHandler_Endpoints(t *testing.T) {
 
 		for _, nodeUsage := range nodeUsages {
 			numIndexes := len(nodeUsage.Disk.IndexUsage)
-			fmt.Printf("Node Usage: %v\n", nodeUsage)
+			fmt.Printf("Node Usage: +%v\n", nodeUsage)
+			fmt.Printf("Disk Usage: +%v\n", nodeUsage.Disk)
+			fmt.Printf("Index Usage: +%v\n", nodeUsage.Disk.IndexUsage)
 			// if nodeUsage.Disk.TotalUse < 75000 || nodeUsage.Disk.TotalUse > 700000 {
-			if nodeUsage.Disk.TotalUse < 50 || nodeUsage.Disk.TotalUse > 700000 {
+			if nodeUsage.Disk.TotalUse < 1 {
 				// Usage measurements are not consistent between machines, or
 				// over time, as features and implementations change, so checking
 				// for a range of sizes may be most useful way to test the details of this.