diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index fa21ba3840..6bf8de0124 100755
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -534,6 +534,13 @@ void LLLocalBitmap::updateUserSculpts(LLUUID old_id, LLUUID new_id)
 
 void LLLocalBitmap::updateUserLayers(LLUUID old_id, LLUUID new_id, LLWearableType::EType type)
 {
+	// <FS:Ansariel> FIRE-15787: Crash fix
+	if (!gAgentAvatarp)
+	{
+		return;
+	}
+	// </FS:Ansariel>
+
 	U32 count = gAgentWearables.getWearableCount(type);
 	for(U32 wearable_iter = 0; wearable_iter < count; wearable_iter++)
 	{