diff --git a/src/DBManager.cpp b/src/DBManager.cpp
index d540743da2d9c0495efc98faff0888f5be791c5c..c538d42332cc025d0c063b9d81b7ee45c912fe21 100644
--- a/src/DBManager.cpp
+++ b/src/DBManager.cpp
@@ -43,7 +43,7 @@ DBManager::SP DBManager::create(Tango::DeviceImpl* deviceImpl_p,
 //==============================================================================
 //      DBManager::connect()
 //==============================================================================
-void DBManager::connect() throw(soci::soci_error)
+void DBManager::connect() /*throw(soci::soci_error)*/
 {
     DEBUG_STREAM << "DBManager::connect()" << endl;
 
@@ -94,7 +94,7 @@ void DBManager::disconnect()
 //      DBManager::retrieveInformation()
 //==============================================================================
 DBManager::InformationList DBManager::retrieveInformation(std::string schema,
-    std::string table) throw(soci::soci_error)
+    std::string table) /*throw(soci::soci_error)*/
 {
     DEBUG_STREAM << "DBManager::retrieveInformation()" << endl;
 
@@ -122,7 +122,7 @@ DBManager::InformationList DBManager::retrieveInformation(std::string schema,
 //      DBManager::retrieveNewTuples()
 //==============================================================================
 DBManager::RowsetSP DBManager::retrieveNewTuples(std::string schema,
-    std::string table, std::tm update_time) throw(soci::soci_error, std::out_of_range)
+    std::string table, std::tm update_time) /*throw(soci::soci_error, std::out_of_range)*/
 {
     DEBUG_STREAM << "DBManager::retrieveNewTuples()" << endl;
 
diff --git a/src/DBManager.h b/src/DBManager.h
index f56f351c75492035344fad41560f8389865f8492..040aa91b4098d3ff532bcfa38f24d036d94c9523 100644
--- a/src/DBManager.h
+++ b/src/DBManager.h
@@ -57,7 +57,7 @@ public:
 //------------------------------------------------------------------------------
 //  [Public] Connection management methods
 //------------------------------------------------------------------------------
-    virtual void connect() throw(soci::soci_error);
+    virtual void connect() /*throw(soci::soci_error)*/;
 
     virtual void disconnect();
 
@@ -70,7 +70,7 @@ public:
     typedef std::vector< InformationTuple > InformationList;
 
     virtual InformationList retrieveInformation(std::string,
-        std::string) throw(soci::soci_error);
+        std::string) /*throw(soci::soci_error)*/;
 
 //------------------------------------------------------------------------------
 //  [Public] Retrieve new tuple method
@@ -78,7 +78,7 @@ public:
     typedef boost::shared_ptr< soci::rowset<soci::row> > RowsetSP;
 
     virtual RowsetSP retrieveNewTuples(std::string, std::string, std::tm)
-        throw(soci::soci_error, std::out_of_range);
+        /*throw(soci::soci_error, std::out_of_range)*/;
 
 protected:
 //------------------------------------------------------------------------------
diff --git a/src/MetadataExporter.cpp b/src/MetadataExporter.cpp
index 1db605a1aed1b4176c8b1ec424e0270c909341e0..7fe7652a8c8d34eb0006adf5805c7563ad010f40 100644
--- a/src/MetadataExporter.cpp
+++ b/src/MetadataExporter.cpp
@@ -630,7 +630,7 @@ void MetadataExporter::off()
 //==============================================================================
 void MetadataExporter::importExportedTables(std::vector<std::string>& exportedTables,
     std::multimap<const std::string, const std::string>& exportedTablesMap)
-    throw(std::invalid_argument)
+    /*throw(std::invalid_argument)*/
 {
     DEBUG_STREAM << "MetadataExporter::importExportedTables()  - " << device_name << endl;
 
@@ -678,7 +678,7 @@ void MetadataExporter::importExportedTables(std::vector<std::string>& exportedTa
 //==============================================================================
 void MetadataExporter::importAuthorisedUsers(std::vector<std::string>& authorisedUsers,
     std::map<const std::string, const std::string>& authorisedUsersMap)
-    throw(std::invalid_argument)
+    /*throw(std::invalid_argument)*/
 {
     DEBUG_STREAM << "MetadataExporter::importAuthorisedUsers()  - " << device_name << endl;
 
@@ -728,7 +728,7 @@ void MetadataExporter::importAuthorisedUsers(std::vector<std::string>& authorise
 //      MetadataExporter::checkIfFileExists()
 //==============================================================================
 void MetadataExporter::checkIgnoreColumns(std::vector<std::string>& ignoreColumns)
-    throw(std::invalid_argument)
+    /*throw(std::invalid_argument)*/
 {
     DEBUG_STREAM << "MetadataExporter::checkIgnoreColumns()  - " << device_name << endl;
 
@@ -763,7 +763,7 @@ void MetadataExporter::checkIgnoreColumns(std::vector<std::string>& ignoreColumn
 //      MetadataExporter::checkIfFileExists()
 //==============================================================================
 void MetadataExporter::checkIfFileExists(std::string fileName)
-    throw(std::invalid_argument)
+    /*throw(std::invalid_argument)*/
 {
     DEBUG_STREAM << "MetadataExporter::checkIfFileExists()  - " << device_name << endl;
 
diff --git a/src/MetadataExporter.h b/src/MetadataExporter.h
index 18c8b0bb7decd5dcaa280215d8968ccc0ef026c1..795d7bb10c9b8c6a8f0b1453f5549a716d8f7b38 100644
--- a/src/MetadataExporter.h
+++ b/src/MetadataExporter.h
@@ -231,17 +231,17 @@ protected:
 //------------------------------------------------------------------------------
     virtual void importExportedTables(std::vector<std::string>&,
         std::multimap<const std::string, const std::string>&)
-        throw(std::invalid_argument);
+        /*throw(std::invalid_argument)*/;
 
     virtual void importAuthorisedUsers(std::vector<std::string>&,
         std::map<const std::string, const std::string>&)
-        throw(std::invalid_argument);
+        /*throw(std::invalid_argument)*/;
 
     virtual void checkIgnoreColumns(std::vector<std::string>&)
-        throw(std::invalid_argument);
+        /*throw(std::invalid_argument)*/;
 
     virtual void checkIfFileExists(std::string)
-        throw(std::invalid_argument);
+        /*throw(std::invalid_argument)*/;
 
 /*----- PROTECTED REGION END -----*/	//	MetadataExporter::Additional Method prototypes
 };
diff --git a/src/ProtocolManager.cpp b/src/ProtocolManager.cpp
index 7e6a8962ca82e9538ec5f178059533138e9c2a24..279fbdcf94318efcefae8c97a9e68230e3e1f869 100644
--- a/src/ProtocolManager.cpp
+++ b/src/ProtocolManager.cpp
@@ -53,7 +53,7 @@ void ProtocolManager::setRemoteEndpoint(std::string remoteEndpoint)
 //      ProtocolManager::prepareResponse()
 //==============================================================================
 ResponseSP ProtocolManager::prepareResponse(RequestSP request_sp)
-    throw(std::runtime_error)
+    /*throw(std::runtime_error)*/
 {
     DEBUG_STREAM << "ProtocolManager::prepareResponse()" << endl;
 
@@ -329,7 +329,7 @@ ResponseSP ProtocolManager::prepareMetadata(RequestSP request_sp)
 //      ProtocolManager::validateColumn()
 //==============================================================================
 void ProtocolManager::validateColumn(const Request::Validation::Column& column,
-    DBManager::InformationList& informationList) throw(std::runtime_error)
+    DBManager::InformationList& informationList) /*throw(std::runtime_error)*/
 {
     DEBUG_STREAM << "ProtocolManager::validateColumn()" << endl;
 
@@ -392,7 +392,7 @@ void ProtocolManager::validateColumn(const Request::Validation::Column& column,
 //      ProtocolManager::fillMetadata()
 //==============================================================================
 void ProtocolManager::fillMetadata(Response::Metadata* metadataRes)
-    throw(std::runtime_error, std::out_of_range)
+    /*throw(std::runtime_error, std::out_of_range)*/
 {
     DEBUG_STREAM << "ProtocolManager::fillMetadata()" << endl;
 
@@ -439,7 +439,7 @@ void ProtocolManager::fillMetadata(Response::Metadata* metadataRes)
 //      ProtocolManager::fillRow()
 //==============================================================================
 void ProtocolManager::fillRow(Response::Metadata::Row* row)
-    throw(std::runtime_error, std::out_of_range)
+    /*throw(std::runtime_error, std::out_of_range)*/
 {
     DEBUG_STREAM << "ProtocolManager::fillRow()" << endl;
 
diff --git a/src/ProtocolManager.h b/src/ProtocolManager.h
index 8d267f4a9a244b5c998970815f3bffd608980dc0..ced34374c897ce3a5e0e7645919fb49738338a6c 100644
--- a/src/ProtocolManager.h
+++ b/src/ProtocolManager.h
@@ -57,7 +57,7 @@ public:
 //  [Public] Request response management method
 //------------------------------------------------------------------------------
     virtual ResponseSP prepareResponse(RequestSP)
-        throw(std::runtime_error);
+        /*throw(std::runtime_error)*/;
 
 protected:
 //------------------------------------------------------------------------------
@@ -73,16 +73,16 @@ protected:
 //  [Protected] Columns validation method
 //------------------------------------------------------------------------------
     virtual void validateColumn(const Request::Validation::Column&,
-        DBManager::InformationList&) throw(std::runtime_error);
+        DBManager::InformationList&) /*throw(std::runtime_error)*/;
 
 //------------------------------------------------------------------------------
 //  [Protected] Metadata serialization method
 //------------------------------------------------------------------------------
     virtual void fillMetadata(Response::Metadata*)
-        throw(std::runtime_error, std::out_of_range);
+        /*throw(std::runtime_error, std::out_of_range)*/;
 
     virtual void fillRow(Response::Metadata::Row*)
-        throw(std::runtime_error, std::out_of_range);
+        /*throw(std::runtime_error, std::out_of_range)*/;
 
 //------------------------------------------------------------------------------
 //  [Protected] Class variables
diff --git a/src/Server.cpp b/src/Server.cpp
index 3c06d7d55ae95d2cf0839a17a8beba9d9c2188aa..b16eaa88f613f917a9b1ccaa4cb5b68b0609a060 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -56,7 +56,7 @@ Server::~Server()
 //==============================================================================
 //      Server::start()
 //==============================================================================
-void Server::start() throw(std::runtime_error)
+void Server::start() /*throw(std::runtime_error)*/
 {
     DEBUG_STREAM << "Server::start()" << endl;
 
@@ -103,7 +103,7 @@ void Server::start() throw(std::runtime_error)
 //==============================================================================
 //      Server::stop()
 //==============================================================================
-void Server::stop() throw(std::runtime_error)
+void Server::stop() /*throw(std::runtime_error)*/
 {
     DEBUG_STREAM << "Server::stop()" << endl;
 
@@ -196,4 +196,4 @@ void Server::handleAccept(Session::SP session_sp,
     startAccept();
 }
 
-}   //namespace
\ No newline at end of file
+}   //namespace
diff --git a/src/Server.h b/src/Server.h
index 0c98dc4e856ad20b9faefda668923fa962b6d463..b7621ebca6c0ef52ec0b72afe6e5fbc871ca68c4 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -34,9 +34,9 @@ public:
 //------------------------------------------------------------------------------
 //	[Public] Thread management methods
 //------------------------------------------------------------------------------
-    virtual void start() throw(std::runtime_error);
+    virtual void start() /*throw(std::runtime_error)*/;
 
-    virtual void stop() throw(std::runtime_error);
+    virtual void stop() /*throw(std::runtime_error)*/;
 
 //------------------------------------------------------------------------------
 //	[Public] Read state and status methods
diff --git a/src/Session.cpp b/src/Session.cpp
index b05a1abdd9df4429a18d0713f7f6ce49d695e2aa..8486564c13a9480b8d540d68cd1b8f43ce9c3444 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -100,7 +100,7 @@ void Session::handleWriteResponse(const boost::system::error_code& errorCode)
 //      Session::encodeHeader()
 //==============================================================================
 void Session::encodeHeader(std::vector<boost::uint8_t>& buf, boost::uint32_t size)
-    throw(std::runtime_error)
+    /*throw(std::runtime_error)*/
 {
     DEBUG_STREAM << "Session::encodeHeader()" << endl;
 
@@ -117,7 +117,7 @@ void Session::encodeHeader(std::vector<boost::uint8_t>& buf, boost::uint32_t siz
 //      Session::decodeHeader()
 //==============================================================================
 boost::uint32_t Session::decodeHeader(std::vector<boost::uint8_t>& buf)
-    throw(std::runtime_error)
+    /*throw(std::runtime_error)*/
 {
     DEBUG_STREAM << "Session::decodeHeader()" << endl;
 
diff --git a/src/Session.h b/src/Session.h
index b3730319ad0589140dba14291674daa7868333b4..73e800669026ce72c52d9205067a1303c5472351 100644
--- a/src/Session.h
+++ b/src/Session.h
@@ -67,10 +67,10 @@ protected:
 //  [Protected] Encode decode header methods
 //------------------------------------------------------------------------------
     virtual void encodeHeader(std::vector<boost::uint8_t>&, boost::uint32_t)
-        throw(std::runtime_error);
+        /*throw(std::runtime_error)*/;
 
     virtual boost::uint32_t decodeHeader(std::vector<boost::uint8_t>&)
-        throw(std::runtime_error);
+        /*throw(std::runtime_error)*/;
 
 //------------------------------------------------------------------------------
 //	[Protected] Class variables