diff --git a/include/iri_base_driver/iri_base_driver_node.h b/include/iri_base_driver/iri_base_driver_node.h
index e8e1043ac9aff4c7f5b555a08a3557af39769e82..cdbee840ac9b6f4debd347d564575d98843f0b4a 100644
--- a/include/iri_base_driver/iri_base_driver_node.h
+++ b/include/iri_base_driver/iri_base_driver_node.h
@@ -24,10 +24,6 @@
 #include <diagnostic_updater/diagnostic_updater.h>
 #include "iri_base_driver.h"
 
-// iri-utils thread server
-#include "threadserver.h"
-#include "exceptions.h"
-
 namespace iri_base_driver
 {
 
@@ -356,17 +352,10 @@ template <class Driver>
 IriBaseNodeDriver<Driver>::~IriBaseNodeDriver()
 {
   ROS_DEBUG("IriBaseNodeDriver::Destrcutor");
-  try
-  {
-    //try access to driver to assert it is
-    //unlock before its destruction
-    this->driver_.try_enter();
-    this->driver_.unlock();
-  }
-  catch(CException e)
-  {
-    std::cout << e.what() << std::endl;
-  }
+  //try access to driver to assert it is
+  //unlock before its destruction
+  this->driver_.try_enter();
+  this->driver_.unlock();
   
   this->driver_.close();
   pthread_cancel(this->thread);