diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 3ae03065690f30ddec63320bc2854bff3c9b4d40..0acb623d2a2960109cfce3f0d3d79d359c8bf05b 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2332,9 +2332,11 @@ bool LLVOVolume::notifyAboutCreatingTexture(LLViewerTexture *texture)
 	for(mmap_UUID_MAP_t::iterator range_it = range.first; range_it != range.second; ++range_it)
 	{
 		LLMaterialPtr cur_material = getTEMaterialParams(range_it->second.te);
+		if (cur_material.isNull())
+			continue;
 
 		//here we just interesting in DIFFUSE_MAP only!
-		if(NULL != cur_material.get() && LLRender::DIFFUSE_MAP == range_it->second.map && GL_RGBA != texture->getPrimaryFormat())
+		if(LLRender::DIFFUSE_MAP == range_it->second.map && GL_RGBA != texture->getPrimaryFormat())
 		{ //ok let's check the diffuse mode
 			switch(cur_material->getDiffuseAlphaMode())
 			{