diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 64ec356778..147d453854 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -392,6 +392,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
         /// <param name="msg"></param>
         private void OnGridInstantMessage(GridInstantMessage msg)
         {
+            // Check if this is ours to handle
+            //
+            if (msg.dialog != (byte) InstantMessageDialog.InventoryOffered)
+                return;
+
+            if (msg.binaryBucket.Length < 17) // Invalid
+                return;
+
             Scene scene = FindClientScene(new UUID(msg.toAgentID));
 
             // Find agent to deliver to