1 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 85b5d3f..cb65e9e 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -152,6 +152,12 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
                         new UUID(im.toAgentID),
                         client.AgentId, itemID);
 
+                if (itemCopy == null)
+                {
+                    client.SendAgentAlertMessage("Can't find item to give. Nothing given.", false);
+                    return;
+                }
+
                 byte[] itemCopyID = itemCopy.ID.GetBytes();
 
                 Array.Copy(itemCopyID, 0, im.binaryBucket, 1, 16);