diff --git a/indra/llprimitive/llmodelloader.h b/indra/llprimitive/llmodelloader.h
index 568b3ead4e..9a042a4e30 100644
--- a/indra/llprimitive/llmodelloader.h
+++ b/indra/llprimitive/llmodelloader.h
@@ -179,7 +179,7 @@ public:
 	//-----------------------------------------------------------------------------
 	bool isNodeAJoint(const char* name)
 	{
-		return mJointMap.find(name) != mJointMap.end();
+		return name != NULL && mJointMap.find(name) != mJointMap.end();
 	}
 
 protected: