diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index a5a64ef0a637523f599e35ee17e9e446b26bb5e8..58ceb4a0edb9b22404c82c4359878d31482a36ef 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -341,6 +341,11 @@ void LLMotionController::removeMotionInstance(LLMotion* motionp)
 //-----------------------------------------------------------------------------
 LLMotion* LLMotionController::createMotion( const LLUUID &id )
 {
+	if (id.isNull())
+	{
+		return NULL;
+	}
+
 	// do we have an instance of this motion for this character?
 	LLMotion *motion = findMotion(id);