diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
index 3e3ab71c01..068ff4b46b 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
@@ -276,14 +276,16 @@ namespace OpenSim.Framework.Data.SQLite
                 {
                     // I just added this to help the standalone login situation.  
                     //It still needs to be looked at by a Database guy
+                    DataTable ua = ds.Tables["useragents"];
+                    row = ua.Rows.Find(user.UUID);
+
                     if (row == null)
                     {
                         // do nothing
                     }
                     else
                     {
-                        DataTable ua = ds.Tables["useragents"];
-                        row = ua.Rows.Find(user.UUID);
+                       
                         row.Delete();
                         ua.AcceptChanges();
                     }