diff --git a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
index c44320382d..923b06c2ce 100644
--- a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
+++ b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
@@ -256,6 +256,11 @@ namespace OpenSim.Grid.UserServer.Modules
                         }
                     }
                 }
+                else if ((templateItems != null) && (templateItems.Count == 0))
+                {
+                   // m_log.Info("[AvatarAppearance]Folder being cloned was empty");
+                    success = true;
+                }
 
                 List<InventoryFolderBase> subFolders = FindSubFolders(templateFolder.ID.Guid, templateFolders);
                 foreach (InventoryFolderBase subFolder in subFolders)