diff --git a/src/clans.cpp b/src/clans.cpp
index 5b5e755..25c29de 100644
--- a/src/clans.cpp
+++ b/src/clans.cpp
@@ -56,7 +56,7 @@ u16 ClansManager::clanId(const std::string& name) const
 const std::string& ClansManager::clanName(u16 id) const
 {
 	std::map<u16,std::string>::const_iterator it = m_idName.find(id);
-	if(it==m_idName.end()) throw std::exception("Clan doesn't exist"); //TODO: some other exception
+	if(it==m_idName.end()) throw BaseException("Clan doesn't exist");
 	return it->second;
 }
 
diff --git a/src/server.cpp b/src/server.cpp
index ff1792e..4162378 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -4029,7 +4029,7 @@ void writeClanIdName(std::ostringstream& os, u16 id, const std::string& name){
 		u8		clan name lenght
 		string	clan name
 	*/
-	if(name.length() > 0xFFFF) throw std::exception("too long clan name"); //exception?
+	if(name.length() > 0xFFFF) throw BaseException("too long clan name");
 
 	writeU16(os,id);