diff --git a/sflphone-common/src/config/yamlemitter.h b/sflphone-common/src/config/yamlemitter.h
index 8c45c3ab279483ede9dd612955b77765ee154fc0..13f3c8df78b2ee6cef8fd52f9cfee5fa0f43db02 100644
--- a/sflphone-common/src/config/yamlemitter.h
+++ b/sflphone-common/src/config/yamlemitter.h
@@ -32,7 +32,7 @@
 #define __YAMLEMITTER_H__
 
 #include <yaml.h>
-#include <exception>
+#include <stdexcept>
 #include <string>
 #include "yamlnode.h"
 
@@ -42,22 +42,11 @@ namespace Conf
 #define EMITTER_BUFFERSIZE 65536
 #define EMITTER_MAXEVENT 1024
 
-class YamlEmitterException : public std::exception
+class YamlEmitterException : public std::runtime_error
 {
     public:
-        YamlEmitterException (const std::string& str="") throw() : errstr (str) {}
-
-        virtual ~YamlEmitterException() throw() {}
-
-        virtual const char *what() const throw() {
-            std::string expt ("YamlParserException occured: ");
-            expt.append (errstr);
-
-            return expt.c_str();
-        }
-    private:
-        std::string errstr;
-
+        YamlEmitterException (const std::string& str="") :
+            std::runtime_error("YamlParserException occured: " + str) {}
 };
 
 class YamlEmitter