1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 50a1d73..369fc51 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -813,7 +813,8 @@ namespace OpenSim.Data.SQLite
             user.ID = tmp;
             user.FirstName = (String) row["username"];
             user.SurName = (String) row["surname"];
-            user.Email = (String) row["email"];
+            user.Email = (row.IsNull("email")) ? "" : (String) row["email"];
+
             user.PasswordHash = (String) row["passwordHash"];
             user.PasswordSalt = (String) row["passwordSalt"];