diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 3c50cc15789cb4f05dc382f559cfe882390beb0a..7045e6d6b1fc2cbdc729e30b9f130a47ca4b100a 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6249,13 +6249,17 @@ void LLPipeline::calcNearbyLights(LLCamera& camera)
 		{
 			LLDrawable* drawable = light.drawable;
             const LLViewerObject *vobj = light.drawable->getVObj();
-            if(vobj && vobj->getAvatar() 
-               && (vobj->getAvatar()->isTooComplex() || vobj->getAvatar()->isInMuteList())
-               )
-            {
-                drawable->clearState(LLDrawable::NEARBY_LIGHT);
-                continue;
-            }
+			if (vobj)
+			{
+				if (LLVOAvatar* avatarp = vobj->getAvatar())
+				{
+					if (avatarp->isTooComplex() || avatarp->isInMuteList())
+					{
+						drawable->clearState(LLDrawable::NEARBY_LIGHT);
+						continue;
+					}
+				}
+			}
 
 			LLVOVolume* volight = drawable->getVOVolume();
 			if (!volight || !drawable->isState(LLDrawable::LIGHT))