diff --git a/src/buddy.cpp b/src/buddy.cpp
index 5e9b30b675bc5c2665aae7769250475aff00abc0..535a285af265beb73a76868fa8e891f520eebb85 100644
--- a/src/buddy.cpp
+++ b/src/buddy.cpp
@@ -51,7 +51,10 @@ long Buddy::getID() {
 void Buddy::setFlags(BuddyFlag flags) {
 	m_flags = flags;
 
-// 	generateJID();
+	try {
+		generateJID();
+	} catch (...) {
+	}
 }
 
 BuddyFlag Buddy::getFlags() {
diff --git a/src/localbuddy.cpp b/src/localbuddy.cpp
index 8e19f7fba5085d8f8cefbf484730af147f052c0a..65d54d2b43566eb0f7e01aa794e32fe0844e84f5 100644
--- a/src/localbuddy.cpp
+++ b/src/localbuddy.cpp
@@ -44,7 +44,6 @@ bool LocalBuddy::setName(const std::string &name) {
 		m_name = oldName;
 		return false;
 	}
-	
 }
 
 void LocalBuddy::setAlias(const std::string &alias) {