1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Server/Handlers/AgentPreferences/AgentPreferencesServerPostHandler.cs b/OpenSim/Server/Handlers/AgentPreferences/AgentPreferencesServerPostHandler.cs
index 713b755..b1b3c6f 100644
--- a/OpenSim/Server/Handlers/AgentPreferences/AgentPreferencesServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/AgentPreferences/AgentPreferencesServerPostHandler.cs
@@ -106,7 +106,8 @@ namespace OpenSim.Server.Handlers.AgentPreferences
                 return FailureResult();
             AgentPrefs prefs = m_AgentPreferencesService.GetAgentPreferences(userID);
             Dictionary<string, object> result = new Dictionary<string, object>();
-            result = prefs.ToKeyValuePairs();
+            if (prefs != null)
+                result = prefs.ToKeyValuePairs();
 
             string xmlString = ServerUtils.BuildXmlResponse(result);