diff --git a/http_fetcher.cc b/http_fetcher.cc
index 7d9297a..9e1e0ac 100644
--- a/http_fetcher.cc
+++ b/http_fetcher.cc
@@ -31,6 +31,7 @@
     no_resolver_idle_id_ = g_idle_add(utils::GlibRunClosure, callback);
     return true;
   }
+  CHECK_EQ(reinterpret_cast<Closure*>(NULL), callback_);
   callback_ = callback;
   return proxy_resolver_->GetProxiesForUrl(url,
                                            &HttpFetcher::StaticProxiesResolved,
@@ -41,8 +42,11 @@
   no_resolver_idle_id_ = 0;
   if (!proxies.empty())
     SetProxies(proxies);
-  callback_->Run();
+  CHECK_NE(reinterpret_cast<Closure*>(NULL), callback_);
+  Closure* callback = callback_;
   callback_ = NULL;
+  // This may indirectly call back into ResolveProxiesForUrl():
+  callback->Run();
 }
 
 }  // namespace chromeos_update_engine
diff --git a/multi_range_http_fetcher.cc b/multi_range_http_fetcher.cc
index 16d2c09..8b3d8d7 100644
--- a/multi_range_http_fetcher.cc
+++ b/multi_range_http_fetcher.cc
@@ -123,7 +123,7 @@
     successful = true;
   }
 
-  // If we have another fetcher, use that.
+  // If we have another transfer, do that.
   if (current_index_ + 1 < ranges_.size()) {
     current_index_++;
     LOG(INFO) << "Starting next transfer (" << current_index_ << ").";