diff --git a/ci/long_running_tests/workloads/node_failures.py b/ci/long_running_tests/workloads/node_failures.py
index 20de8358d..7a50e2dd7 100644
--- a/ci/long_running_tests/workloads/node_failures.py
+++ b/ci/long_running_tests/workloads/node_failures.py
@@ -49,7 +49,7 @@ while True:
     for _ in range(100):
         previous_ids = [f.remote(previous_id) for previous_id in previous_ids]
 
-    ray.wait(previous_ids, num_returns=len(previous_ids))
+    ray.get(previous_ids)
 
     for _ in range(100):
         previous_ids = [f.remote(previous_id) for previous_id in previous_ids]
diff --git a/src/ray/object_manager/object_manager.cc b/src/ray/object_manager/object_manager.cc
index 08c05a0f4..b8458bcbe 100644
--- a/src/ray/object_manager/object_manager.cc
+++ b/src/ray/object_manager/object_manager.cc
@@ -165,7 +165,10 @@ void ObjectManager::TryPull(const ObjectID &object_id) {
   auto &client_vector = it->second.client_locations;
 
   // The timer should never fire if there are no expected client locations.
-  RAY_CHECK(!client_vector.empty());
+  if (client_vector.empty()) {
+    return;
+  }
+
   RAY_CHECK(local_objects_.count(object_id) == 0);
   // Make sure that there is at least one client which is not the local client.
   // TODO(rkn): It may actually be possible for this check to fail.