diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc
index 8a0cddad..f30e4594 100644
--- a/src/client/linux/handler/exception_handler.cc
+++ b/src/client/linux/handler/exception_handler.cc
@@ -230,6 +230,8 @@ ExceptionHandler::~ExceptionHandler() {
       std::find(handler_stack_->begin(), handler_stack_->end(), this);
   handler_stack_->erase(handler);
   if (handler_stack_->empty()) {
+    delete handler_stack_;
+    handler_stack_ = NULL;
     RestoreAlternateStackLocked();
     RestoreHandlersLocked();
   }