1 files changed, 4 insertions, 2 deletions
diff --git a/vbench/src/vbench/core/handler_thread.hpp b/vbench/src/vbench/core/handler_thread.hpp
index 1a99861ea81..3373e196ab7 100644
--- a/vbench/src/vbench/core/handler_thread.hpp
+++ b/vbench/src/vbench/core/handler_thread.hpp
@@ -31,13 +31,15 @@ HandlerThread<T>::HandlerThread(Handler<T> &next, init_fun_t init_fun)
       _thread(),
       _done(false)
 {
-    _thread = vespalib::Thread::start(*this, init_fun);
+    _thread = vespalib::thread::start(*this, init_fun);
 }
 
 template <typename T>
 HandlerThread<T>::~HandlerThread()
 {
-    join();
+    if (!_done) {
+        join();
+    }
     assert(_queue.empty());
 }