1 files changed, 5 insertions, 1 deletions

diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index c20c392..948cdf3 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -187,7 +187,11 @@ namespace OpenSim.Data.MySQL
                             if (s == "locY")
                                 continue;
 
-                            ret.Data[s] = result[s].ToString();
+                            object value = result[s];
+                            if (value is DBNull)
+                                ret.Data[s] = null;
+                            else
+                                ret.Data[s] = result[s].ToString();
                         }
 
                         retList.Add(ret);