diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 6b3afe0ab8..f4be2670b5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -593,7 +593,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (World.Entities.ContainsKey((UUID)avatar) && World.Entities[avatarID] is ScenePresence)
             {
                 ScenePresence target = (ScenePresence)World.Entities[avatarID];
-                target.AddAnimation(animation, m_host.UUID);
+                if (target != null)
+                {
+					UUID animID=UUID.Zero;
+                    lock (m_host.TaskInventory)
+                    {
+                        foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                        {
+                            if (inv.Value.Name == animation)
+                            {
+                                if (inv.Value.Type == (int)AssetType.Animation)
+                                    animID = inv.Value.AssetID;
+                                continue;
+                            }
+                        }
+                    }
+                    if (animID == UUID.Zero)
+                        target.AddAnimation(animation, m_host.UUID);
+                    else
+                        target.AddAnimation(animID, m_host.UUID);
+                }
             }
         }
 
@@ -607,7 +626,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (World.Entities.ContainsKey(avatarID) && World.Entities[avatarID] is ScenePresence)
             {
                 ScenePresence target = (ScenePresence)World.Entities[avatarID];
-                target.RemoveAnimation(animation);
+				if (target != null)
+				{
+					UUID animID=UUID.Zero;
+                    lock (m_host.TaskInventory)
+                    {
+                        foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                        {
+                            if (inv.Value.Name == animation)
+                            {
+                                if (inv.Value.Type == (int)AssetType.Animation)
+                                    animID = inv.Value.AssetID;
+                                continue;
+                            }
+                        }
+                    }
+                    if (animID == UUID.Zero)
+                        target.RemoveAnimation(animation);
+                    else
+                        target.RemoveAnimation(animID);
+				}
             }
         }