diff --git a/doc/contributions.txt b/doc/contributions.txt
index fa33695478..fc20ab1d25 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -197,6 +197,7 @@ Ansariel Hiller
 	MAINT-6432
 	MAINT-6513
 	MAINT-6514
+	MAINT-6552
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 3e6424e7c6..21577603cc 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1274,7 +1274,7 @@ void LLViewerFetchedTexture::loadFromFastCache()
             {
                 S32 expected_width = mKnownDrawWidth > 0 ? mKnownDrawWidth : DEFAULT_ICON_DIMENTIONS;
                 S32 expected_height = mKnownDrawHeight > 0 ? mKnownDrawHeight : DEFAULT_ICON_DIMENTIONS;
-                if (mRawImage->getWidth() > expected_width || mRawImage->getHeight() > expected_height)
+                if (mRawImage && (mRawImage->getWidth() > expected_width || mRawImage->getHeight() > expected_height))
                 {
                     // scale oversized icon, no need to give more work to gl
                     mRawImage->scale(expected_width, expected_height);