diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py
index a79d09a9ea..fdbb0a75f7 100755
--- a/indra/cmake/run_build_test.py
+++ b/indra/cmake/run_build_test.py
@@ -78,7 +78,7 @@ def main(command, libpath=[], vars={}):
         # No idea what the right pathname might be! But only crump if this
         # feature is requested.
         if libpath:
-            raise NotImplemented("run_build_test: unknown platform %s" % sys.platform)
+            raise RuntimeError("run_build_test: unknown platform %s" % sys.platform)
         lpvars = []
     for var in lpvars:
         # Split the existing path. Bear in mind that the variable in question
diff --git a/indra/llcommon/indra_constants.cpp b/indra/llcommon/indra_constants.cpp
index 90866631fe..1d094cd4f4 100644
--- a/indra/llcommon/indra_constants.cpp
+++ b/indra/llcommon/indra_constants.cpp
@@ -68,4 +68,4 @@ const LLUUID TERRAIN_ROCK_DETAIL		("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // V
 
 const LLUUID DEFAULT_WATER_NORMAL		("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER
 
-const LLUUID IMG_BLACK_SQUARE_MALEVICH	("3b39cc01-c2d1-e194-1181-e4404978b20c"); // On dataserver
+const LLUUID IMG_BLACK_SQUARE	        ("3b39cc01-c2d1-e194-1181-e4404978b20c"); // On dataserver
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h
index 01f091c5e0..875cfb2607 100644
--- a/indra/llcommon/indra_constants.h
+++ b/indra/llcommon/indra_constants.h
@@ -208,7 +208,7 @@ LL_COMMON_API extern const LLUUID TERRAIN_ROCK_DETAIL;
 
 LL_COMMON_API extern const LLUUID DEFAULT_WATER_NORMAL;
 
-LL_COMMON_API extern const LLUUID IMG_BLACK_SQUARE_MALEVICH;
+LL_COMMON_API extern const LLUUID IMG_BLACK_SQUARE;
 
 
 // radius within which a chat message is fully audible
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index dd0b50809f..44dcc7f719 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1974,10 +1974,28 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow)
 			{
 				//order is important here LLRender::DIFFUSE_MAP should be last, becouse it change 
 				//(gGL).mCurrTextureUnitIndex
-				// <FS:Ansariel> Don't assume a certain default texture exists on the server
-				//gGL.getTexUnit(specular_channel)->bind(LLPipeline::sImpostorRender ? LLViewerTextureManager::findTexture(IMG_BLACK_SQUARE_MALEVICH) : face->getTexture(LLRender::SPECULAR_MAP));
-				gGL.getTexUnit(specular_channel)->bind(LLPipeline::sImpostorRender ? LLViewerTextureManager::getFetchedTextureFromFile("black_square.png") : face->getTexture(LLRender::SPECULAR_MAP));
-				// </FS:Ansariel>
+                LLViewerTexture* specular = NULL;
+                if (LLPipeline::sImpostorRender)
+                {
+					// <FS:Ansariel> Don't assume a certain default texture exists on the server
+                    //std::vector<LLViewerFetchedTexture*> found;
+                    //LLViewerTextureManager::findFetchedTextures(IMG_BLACK_SQUARE, found);
+                    //if (1 <= found.size())
+                    //{
+                    //    specular = found[0];
+                    //}
+					specular = LLViewerTextureManager::getFetchedTextureFromFile("black_square.png");
+					// </FS:Ansariel>
+                }
+                else
+                {
+                    specular = face->getTexture(LLRender::SPECULAR_MAP);
+                }
+                if (specular)
+                {
+                    gGL.getTexUnit(specular_channel)->bind(specular);
+                }
+                
 				gGL.getTexUnit(normal_channel)->bind(face->getTexture(LLRender::NORMAL_MAP));
 				gGL.getTexUnit(sDiffuseChannel)->bind(face->getTexture(LLRender::DIFFUSE_MAP), false, true);