2 files changed, 13 insertions, 7 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 68e7425..3129c19 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2899,6 +2899,12 @@ namespace OpenSim.Region.ScriptEngine.Common
                     break;
                 }
             }
+
+            if (!found)
+            {
+                llSay(0, String.Format("Could not find object '{0}'", inventory));
+                throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
+            }
             
             // check if destination is an avatar
             if (World.GetScenePresence(destId) != null)
@@ -2911,9 +2917,6 @@ namespace OpenSim.Region.ScriptEngine.Common
                 // destination is an object
                 World.MoveTaskInventoryItem(destId, m_host, objId);
             }
-
-            if (!found)
-                llSay(0, "Could not find object " + inventory);
         }
 
         public void llRemoveInventory(string name)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index f3e9b09..ac4d43a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2770,7 +2770,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     break;
                 }
             }
-            
+
+            if (!found)
+            {
+                llSay(0, String.Format("Could not find object '{0}'", inventory));
+                throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
+            }
+
             // check if destination is an avatar
             if (World.GetScenePresence(destId) != null)
             {
@@ -2782,9 +2788,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 // destination is an object
                 World.MoveTaskInventoryItem(destId, m_host, objId);
             }
-
-            if (!found)
-                llSay(0, "Could not find object " + inventory);
         }
 
         public void llRemoveInventory(string item)