diff --git a/backends/skype/main.cpp b/backends/skype/main.cpp
index 699a79d2..42da9f7b 100644
--- a/backends/skype/main.cpp
+++ b/backends/skype/main.cpp
@@ -509,10 +509,14 @@ bool Skype::loadSkypeBuddies() {
 		{
 			std::string buddy = full_friends_list[i];
 
-			buddy = buddy.substr(buddy.rfind(","));
 			if (buddy[0] == ',') {
 				buddy.erase(buddy.begin());
 			}
+
+			if (buddy.rfind(",") != std::string::npos) {
+				buddy = buddy.substr(buddy.rfind(","));
+			}
+
 			LOG4CXX_INFO(logger, "Got buddy " << buddy);
 			std::string st = full_friends_list[i + 5];