2 files changed, 3 insertions, 5 deletions

diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index d3ebbb0..5ba37e6 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -439,17 +439,15 @@ namespace OpenSim.Framework.UserManagement
                     userAgent.agentOnline = false;
                     userAgent.logoutTime = Util.UnixTimeSinceEpoch();
                     //userAgent.sessionID = LLUUID.Zero;
-                    if (regionid != null)
+                    if (regionid != LLUUID.Zero)
                     {
                         userAgent.currentRegion = regionid;
                     }
-                    userAgent.currentHandle = regionhandle;
 
+                    userAgent.currentHandle = regionhandle;
                     userAgent.currentPos = currentPos;
-
                     userProfile.currentAgent = userAgent;
 
-
                     CommitAgent(ref userProfile);
                 }
                 else
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 03db1a6..76ae1ba 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -359,7 +359,7 @@ namespace OpenSim.Framework
 
         public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
         {
-            if (MasterAvatarAssignedUUID.Equals(null) || MasterAvatarAssignedUUID.ToString() == LLUUID.Zero.ToString())
+            if (MasterAvatarAssignedUUID == LLUUID.Zero)
             {
                 return true;
             }