1 files changed, 8 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index 979df59..86ddfaf 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -55,7 +55,14 @@ namespace OpenSim.Region.Environment.Modules
                 byte[] visualParams;
                 GetDefaultAvatarAppearance(out wearables, out visualParams);
                 appearance = new AvatarAppearance(avatarId, wearables, visualParams);
-                m_avatarsAppearance[avatarId] = appearance;
+                try
+                {
+                    m_avatarsAppearance[avatarId] = appearance;
+                }
+                catch (System.NullReferenceException)
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Error("AVATAR", "Unable to load appearance for uninitialized avatar");
+                }
                 return true;
             }
         }