diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index c2002a3f2f..ba8b1ee0f1 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId);
             InventoryFolderBase folder = m_Scene.InventoryService.GetFolder(f);
 
-            if (folder == null)
+            if (folder == null && Enum.IsDefined(typeof(FolderType), (sbyte)invType))
             {
                 folder = m_Scene.InventoryService.GetFolderForType(remoteClient.AgentId, (FolderType)invType);
                 if (folder != null)