Merge branch 'master' into httptests

1 files changed, 5 insertions, 1 deletions

diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
index 5c791e6..eb2867d 100644
--- a/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
@@ -268,8 +268,12 @@ namespace OpenSim.Region.DataSnapshot.Providers
                             {
                                 XmlNode username = nodeFactory.CreateNode(XmlNodeType.Element, "name", "");
                                 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, userOwnerUUID);
-                                username.InnerText = account.FirstName + " " + account.LastName;
+                                if(account != null)
+                                    username.InnerText = account.FirstName + " " + account.LastName;
+                                else
+                                    username.InnerText = "UnKnown";
                                 userblock.AppendChild(username);
+
                             }
                             catch (Exception)
                             {