diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 113a71f3a9..961fc4cba3 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -9102,6 +9102,11 @@ BOOL LLVOAvatar::isTextureDefined(LLVOAvatarDefines::ETextureIndex te, U32 index
 		return FALSE;
 	}
 
+	// <FS:ND> getImage(te, index) can return 0 in some edge cases.
+	if( !getImage( te, index ) )
+		return FALSE;
+	// </FS:ND>
+
 	return (getImage(te, index)->getID() != IMG_DEFAULT_AVATAR && 
 			getImage(te, index)->getID() != IMG_DEFAULT);
 }