diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp
index 3d7534abf0942abeca77e5d01a5fc3fbdaa32925..c965c621f6986dd5110edbb485e81acf234e14db 100644
--- a/src/rostermanager.cpp
+++ b/src/rostermanager.cpp
@@ -303,7 +303,9 @@ void RosterManager::handleRemoteRosterResponse(boost::shared_ptr<Swift::RosterPa
 		buddyInfo.groups = item.getGroups();
 
 		Buddy *buddy = m_component->getFactory()->createBuddy(this, buddyInfo);
-		setBuddy(buddy);
+		if (buddy) {
+			setBuddy(buddy);
+		}
 	}
 }