diff --git a/src/DBManager.cpp b/src/DBManager.cpp
index 6c0e2f1e751a186c10c1eb8771f355c2c55c2b6f..f0efcf4d92af3e6e3141331c374aaa76d59600d8 100644
--- a/src/DBManager.cpp
+++ b/src/DBManager.cpp
@@ -41,7 +41,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;
 
@@ -93,7 +93,7 @@ void DBManager::disconnect()
 //==============================================================================
 DBManager::FileTuple DBManager::retrieveFileInfo(std::string schema,
     std::string table, int version, std::string name)
-    throw(soci::soci_error)
+    /*throw(soci::soci_error)*/
 {
     DEBUG_STREAM << "DBManager::retrieveFileInfo()" << endl;
 
diff --git a/src/DBManager.h b/src/DBManager.h
index 798cd6a88329fee713ea8ac5e49ea151c4bfed36..5b6a5fb58659d435237dee537029029995b8ed76 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();
 
@@ -68,7 +68,7 @@ public:
         boost::optional<std::string> > FileTuple;
 
     virtual FileTuple retrieveFileInfo(std::string, std::string, int, std::string)
-        throw(soci::soci_error);
+        /*throw(soci::soci_error)*/;
 
 protected:
 //------------------------------------------------------------------------------
diff --git a/src/DataExporter.cpp b/src/DataExporter.cpp
index 6d43dfaceebc965aea53592ead22663b6a5880a1..194451a1bd2822f848e5a058763c1c5f05219678 100644
--- a/src/DataExporter.cpp
+++ b/src/DataExporter.cpp
@@ -602,7 +602,7 @@ void DataExporter::off()
 //==============================================================================
 void DataExporter::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 << "DataExporter::importExportedTables()  - " << device_name << endl;
 
@@ -650,7 +650,7 @@ void DataExporter::importExportedTables(std::vector<std::string>& exportedTables
 //==============================================================================
 void DataExporter::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 << "DataExporter::importAuthorisedUsers()  - " << device_name << endl;
 
@@ -700,7 +700,7 @@ void DataExporter::importAuthorisedUsers(std::vector<std::string>& authorisedUse
 //      DataExporter::checkIfFileExists()
 //==============================================================================
 void DataExporter::checkIfFileExists(std::string fileName)
-    throw(std::invalid_argument)
+    /*throw(std::invalid_argument)*/
 {
     DEBUG_STREAM << "DataExporter::checkIfFileExists()  - " << device_name << endl;
 
diff --git a/src/DataExporter.h b/src/DataExporter.h
index 92c751b1b0c8b7ebf62291c29b5a71a14a99c5fc..7e4760817a44eebaefd8657d56e7dc1881b96d97 100644
--- a/src/DataExporter.h
+++ b/src/DataExporter.h
@@ -217,14 +217,14 @@ public:
 //------------------------------------------------------------------------------
     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 checkIfFileExists(std::string)
-        throw(std::invalid_argument);
+        /*throw(std::invalid_argument)*/;
 
 /*----- PROTECTED REGION END -----*/	//	DataExporter::Additional Method prototypes
 };
diff --git a/src/ProtocolManager.cpp b/src/ProtocolManager.cpp
index b1f7e0e7cc804f2f993e80ce0fe6defb31b594eb..6391253e091759488905ad51f97b7bf632b112e2 100644
--- a/src/ProtocolManager.cpp
+++ b/src/ProtocolManager.cpp
@@ -51,7 +51,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;
 
@@ -174,7 +174,7 @@ bool ProtocolManager::isFileFound()
 //==============================================================================
 //      ProtocolManager::getFileWrapper()
 //==============================================================================
-FileWrapper::SP ProtocolManager::getFileWrapper() throw(std::runtime_error)
+FileWrapper::SP ProtocolManager::getFileWrapper() /*throw(std::runtime_error)*/
 {
     DEBUG_STREAM << "ProtocolManager::getFileWrapper()" << endl;
 
diff --git a/src/ProtocolManager.h b/src/ProtocolManager.h
index 315778df0cfbb25528b02a7f9e608b58b7c9d707..0b8729ab2b52f30be884688019d8545c06698282 100644
--- a/src/ProtocolManager.h
+++ b/src/ProtocolManager.h
@@ -60,14 +60,14 @@ public:
 //  [Public] Request response management method
 //------------------------------------------------------------------------------
     virtual ResponseSP prepareResponse(RequestSP)
-        throw(std::runtime_error);
+        /*throw(std::runtime_error)*/;
 
 //------------------------------------------------------------------------------
 //  [Public] File transfer methods
 //------------------------------------------------------------------------------
     bool isFileFound();
 
-    FileWrapper::SP getFileWrapper() throw(std::runtime_error);
+    FileWrapper::SP getFileWrapper() /*throw(std::runtime_error)*/;
 
 protected:
 //------------------------------------------------------------------------------
diff --git a/src/Server.cpp b/src/Server.cpp
index ddeabef20bebc1bdc5163301615cf25b94a120cc..d8d2951a342c60badeea6c074def635e50715ebf 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -58,7 +58,7 @@ Server::~Server()
 //==============================================================================
 //      Server::start()
 //==============================================================================
-void Server::start() throw(std::runtime_error)
+void Server::start() /*throw(std::runtime_error)*/
 {
     DEBUG_STREAM << "Server::start()" << endl;
 
@@ -105,7 +105,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;
 
diff --git a/src/Server.h b/src/Server.h
index 9d030a66c0ef0b28907d8fdfc93680d51ae4c6a0..b91c23dc141c9872c4a1587992644aa31f164e0d 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 e0e2a388e727ea31287b1894b2932cc21b276a5d..40019ed363f45565ef2902e1b1c909ecf506b323 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -129,7 +129,7 @@ void Session::handleWriteData(FileWrapper::SP fileWrapper_sp,
 //      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;
 
@@ -146,7 +146,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 7d2c7085792b6899b5263da15b32f4f01b2df986..fa1206e5c051a19c77e4626ac9a3989eee52f8c0 100644
--- a/src/Session.h
+++ b/src/Session.h
@@ -74,10 +74,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