diff --git a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
index bf188ee6b6..6be205ed10 100644
--- a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
+++ b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
@@ -52,9 +52,9 @@ namespace OpenSim.Data.MySQL
             return ret[0];
         }
 
-        public void Store(AgentPreferencesData data)
+        public override bool Store(AgentPreferencesData data)
         {
-            base.Store(data);
+            return base.Store(data);
         }
     }
 }
diff --git a/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs b/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs
index c27087da9c..4c8472435f 100644
--- a/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs
@@ -52,9 +52,9 @@ namespace OpenSim.Data.PGSQL
             return ret[0];
         }
 
-        public void Store(AgentPreferencesData data)
+        public override bool Store(AgentPreferencesData data)
         {
-            base.Store(data);
+            return base.Store(data);
         }
     }
 }
diff --git a/OpenSim/Data/SQLite/SQLiteAgentPreferencesData.cs b/OpenSim/Data/SQLite/SQLiteAgentPreferencesData.cs
index ea267ac1f9..5bfcedb848 100644
--- a/OpenSim/Data/SQLite/SQLiteAgentPreferencesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAgentPreferencesData.cs
@@ -56,9 +56,9 @@ namespace OpenSim.Data.SQLite
             return ret[0];
         }
 
-        public void Store(AgentPreferencesData data)
+        public override bool Store(AgentPreferencesData data)
         {
-            base.Store(data);
+            return base.Store(data);
         }
     }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
index fcc260fe17..aabdb510df 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
@@ -118,12 +118,13 @@ namespace OpenSim.Region.ClientStack.LindenCaps
 
         public string UpdateAgentPreferences(string request, string path, string param, UUID agent)
         {
+            OSDMap resp = new OSDMap();
             // The viewer doesn't do much with the return value, so for now, if there is no preference service,
             // we'll return a null llsd block for debugging purposes. This may change if someone knows what the
             // correct server response would be here.
             if (m_scenes[0].AgentPreferencesService == null)
             {
-                return "<llsd><undef /></llsd>";
+                return OSDParser.SerializeLLSDXmlString(resp);
             }
             m_log.DebugFormat("[AgentPrefs]: UpdateAgentPreferences for {0}", agent.ToString());
             OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
@@ -158,7 +159,6 @@ namespace OpenSim.Region.ClientStack.LindenCaps
                 data.LanguageIsPublic = req["language_is_public"].AsBoolean();
             }
             m_scenes[0].AgentPreferencesService.StoreAgentPreferences(data);
-            OSDMap resp = new OSDMap();
             OSDMap respAccessPrefs = new OSDMap();
             respAccessPrefs["max"] = data.AccessPrefs;
             resp["access_prefs"] = respAccessPrefs;