diff --git a/src/AlarmHandler.cpp b/src/AlarmHandler.cpp
index 36a0fad4f01ec4b93a4da3df4e5bf03638e90d39..274f4b5cd06127a060fbfbd9f8baf716b4079a2c 100644
--- a/src/AlarmHandler.cpp
+++ b/src/AlarmHandler.cpp
@@ -3469,7 +3469,7 @@ void AlarmHandler::add_alarm(alarm_t& a, bool starting)
 	}
 
 }
-void AlarmHandler::add_event(alarm_t& a, vector<string> &evn) throw(string&)
+void AlarmHandler::add_event(alarm_t& a, vector<string> &evn)
 {
 	DEBUG_STREAM << "AlarmHandler::add_event(): formula '" << a.formula << "' found " << evn.size() << " events" << endl;
 	/*
@@ -4217,7 +4217,7 @@ void AlarmHandler::timer_update()
 	}
 }
 
-bool AlarmHandler::remove_alarm(string& s) throw(string&)
+bool AlarmHandler::remove_alarm(string& s)
 {
 	DEBUG_STREAM << "AlarmHandler::"<<__func__<<": entering alm name=" << s << endl;
 	alarms.vlock->writerIn();
@@ -4327,7 +4327,7 @@ bool AlarmHandler::remove_alarm(string& s) throw(string&)
 }  /* remove_alarm() */
 
 
-/*void AlarmHandler::add_to_database(alarm_t& a) throw(string&)
+/*void AlarmHandler::add_to_database(alarm_t& a)
 {
 	Tango::DbDatum alarm("alarm");
 	Tango::DbData db_data;
diff --git a/src/AlarmHandler.h b/src/AlarmHandler.h
index 1d96b0879f9b5cb02609e4f30dc2a5fa823b3c71..1f0fe2e80cc8152fd09e99e2842a7de2cf20acd7 100644
--- a/src/AlarmHandler.h
+++ b/src/AlarmHandler.h
@@ -593,13 +593,13 @@ private:
 	void init_alarms(map< string,vector<string> > &alarm_events);
 #endif
 	void add_alarm(alarm_t& a, bool starting=false);
-	void add_event(alarm_t& a, vector<string> &evn) throw(string&);
+	void add_event(alarm_t& a, vector<string> &evn);
 #if 0
-	void subscribe_event(alarm_t& a, EventCallBack& ecb, vector<string> &evn) throw(string&);
+	void subscribe_event(alarm_t& a, EventCallBack& ecb, vector<string> &evn);
 #endif
 //	void do_alarm(bei_t& e);											//gcc 4 problem??
-	bool remove_alarm(string& s) throw(string&);
-	//void add_to_database(alarm_t& a) throw(string&);
+	bool remove_alarm(string& s);
+	//void add_to_database(alarm_t& a);
 	void set_internal_alarm(string name, Tango::TimeVal t, string msg, unsigned int count=1);
 	
 	void load_alarm(string alarm_string, alarm_t &alm, vector<string> &evn);
diff --git a/src/event_table.cpp b/src/event_table.cpp
index 5de976d01cae246dea15484f36f7f70152cc5702..2a19323790c259bafcf4d3554e605ffce2fb07ee 100644
--- a/src/event_table.cpp
+++ b/src/event_table.cpp
@@ -385,7 +385,7 @@ void event_table::free_proxy(void)
 	}
 }
 
-void event_table::subscribe(EventCallBack& ecb) throw(vector<string> &)//throw(string&)
+void event_table::subscribe(EventCallBack& ecb)
 {
 	vector<string> subscribe_error;
 	if (v_event.empty() == false) {
@@ -409,7 +409,7 @@ void event_table::subscribe(EventCallBack& ecb) throw(vector<string> &)//throw(s
 		throw subscribe_error;
 }
 
-void event_table::unsubscribe(void) throw(string&)
+void event_table::unsubscribe(void)
 {
 	ostringstream o;
 	if (v_event.empty() == false) {
diff --git a/src/event_table.h b/src/event_table.h
index 24220d817cfb511ea679a543faa3de3ebb93cfab..764369b3feed7d55fac9eff7f8d1a3e1fee08ad3 100644
--- a/src/event_table.h
+++ b/src/event_table.h
@@ -154,8 +154,8 @@ class event_table : public Tango::TangoMonitor, public Tango::LogAdapter {
 #if 0
 		void init_proxy(void)  throw(vector<string> &);
 		void free_proxy(void);
-		void subscribe(EventCallBack& ecb) throw(vector<string> &);//throw(string&);
-		void unsubscribe(void) throw(string&);
+		void subscribe(EventCallBack& ecb);
+		void unsubscribe(void);
 #endif
 		/**
 		 * Add a new signal.