diff --git a/test/e2e/kubelet_perf.go b/test/e2e/kubelet_perf.go
index 5764678c0af..ee7ab791d2d 100644
--- a/test/e2e/kubelet_perf.go
+++ b/test/e2e/kubelet_perf.go
@@ -74,7 +74,8 @@ var _ = Describe("Kubelet", func() {
 
 	Describe("resource usage tracking", func() {
 		density := []int{0, 50}
-		for _, podsPerNode := range density {
+		for i := range density {
+			podsPerNode := density[i]
 			name := fmt.Sprintf(
 				"over %v with %d pods per node.", monitoringTime, podsPerNode)
 			It(name, func() {
@@ -107,8 +108,8 @@ var _ = Describe("Kubelet", func() {
 				// entries if we plan to monitor longer (e.g., 8 hours).
 				deadline := time.Now().Add(monitoringTime)
 				for time.Now().Before(deadline) {
+					Logf("Still running...%v left", deadline.Sub(time.Now()))
 					time.Sleep(reportingPeriod)
-					Logf("Still running...")
 					logPodsOnNodes(framework.Client, nodeNames.List())
 				}
 
diff --git a/test/e2e/kubelet_stats.go b/test/e2e/kubelet_stats.go
index 1d6998197c2..e688e460006 100644
--- a/test/e2e/kubelet_stats.go
+++ b/test/e2e/kubelet_stats.go
@@ -413,12 +413,12 @@ func (r *resourceCollector) LogLatest() {
 	defer r.lock.RUnlock()
 	stats := make(map[string]*containerResourceUsage)
 	for _, name := range r.containers {
-		s := r.buffers[name][len(r.buffers)-1]
-		if s == nil {
+		contStats, ok := r.buffers[name]
+		if !ok || len(contStats) == 0 {
 			Logf("Resource usage on node %q is not ready yet", r.node)
 			return
 		}
-		stats[name] = s
+		stats[name] = contStats[len(contStats)-1]
 	}
 	Logf("\n%s", formatResourceUsageStats(r.node, stats))
 }