diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 665bfe56cb..1dfb2d48c3 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -502,7 +502,7 @@ namespace OpenSim.Framework.Capabilities
             llsdFolder.folder_id = invFolder.ID;
             llsdFolder.parent_id = invFolder.ParentID;
             llsdFolder.name = invFolder.Name;
-            if (invFolder.Type == -1)
+            if (invFolder.Type < 0 || invFolder.Type >= TaskInventoryItem.Types.Length)
                 llsdFolder.type = "-1";
             else
                 llsdFolder.type = TaskInventoryItem.Types[invFolder.Type];