diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 76cc835b6..e03d24225 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -174,17 +174,13 @@ LLAvatarListEntry::LLAvatarListEntry(const LLUUID& id, const std::string &name,
 		mActivityType(ACTIVITY_NEW), mActivityTimer(),
 		mIsInList(false), mAge(-1), mAgeAlert(false), mTime(time(NULL))
 {
-	if (mID.notNull())
-	{
-		LLAvatarPropertiesProcessor::getInstance()->addObserver(mID, this);
-		LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(mID);
-	}
+	LLAvatarPropertiesProcessor::getInstance()->addObserver(mID, this);
+	LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(mID);
 }
 
 LLAvatarListEntry::~LLAvatarListEntry()
 {
-	if (mID.notNull())
-		LLAvatarPropertiesProcessor::getInstance()->removeObserver(mID, this);
+	LLAvatarPropertiesProcessor::getInstance()->removeObserver(mID, this);
 }
 
 // virtual
@@ -764,12 +760,6 @@ void LLFloaterAvatarList::refreshAvatarList()
 			continue;
 		}
 
-		if (av_id.isNull())
-		{
-			//llwarns << "Avatar with null key somehow got into the list!" << llendl;
-			continue;
-		}
-
 		element.value = av_id;
 
 		LLScrollListCell::Params mark;