diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 46c367b4e615365899ebbc3c1f20eb5306265256..b68a7774a53c8211e0935acaf9f6c0433b3e9461 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5522,6 +5522,7 @@ void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo)
 	if (!av || (av != this))
 	{
 		LL_WARNS("Avatar") << "called with invalid avatar" << LL_ENDL;
+        return;
 	}
 
     LLScopedContextString str("addAttachmentOverridesForObject " + av->getFullname());