diff --git a/src/client/windows/crash_generation/client_info.cc b/src/client/windows/crash_generation/client_info.cc
index 4752c4ae..94f9c3cd 100644
--- a/src/client/windows/crash_generation/client_info.cc
+++ b/src/client/windows/crash_generation/client_info.cc
@@ -101,26 +101,16 @@ ClientInfo::~ClientInfo() {
   }
 }
 
-bool ClientInfo::UnregisterWaits() {
-  bool success = true;
-
+void ClientInfo::UnregisterWaits() {
   if (dump_request_wait_handle_) {
-    if (!UnregisterWait(dump_request_wait_handle_)) {
-      success = false;
-    } else {
-      dump_request_wait_handle_ = NULL;
-    }
+    UnregisterWait(dump_request_wait_handle_);
+    dump_request_wait_handle_ = NULL;
   }
 
   if (process_exit_wait_handle_) {
-    if (!UnregisterWait(process_exit_wait_handle_)) {
-      success = false;
-    } else {
-      process_exit_wait_handle_ = NULL;
-    }
+    UnregisterWait(process_exit_wait_handle_);
+    process_exit_wait_handle_ = NULL;
   }
-
-  return success;
 }
 
 bool ClientInfo::GetClientExceptionInfo(EXCEPTION_POINTERS** ex_info) const {
diff --git a/src/client/windows/crash_generation/client_info.h b/src/client/windows/crash_generation/client_info.h
index 774816fb..47a5d21f 100644
--- a/src/client/windows/crash_generation/client_info.h
+++ b/src/client/windows/crash_generation/client_info.h
@@ -83,7 +83,7 @@ class ClientInfo {
   }
 
   // Unregister all waits for the client.
-  bool UnregisterWaits();
+  void UnregisterWaits();
 
   bool Initialize();
   bool GetClientExceptionInfo(EXCEPTION_POINTERS** ex_info) const;