diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a034c067eb..063ac73251 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3772,10 +3772,13 @@ namespace OpenSim.Region.Framework.Scenes
                 // who is granted god powers, but has no god level set.
                 //
                 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, agentID);
-                if (account != null && account.UserLevel > 0)
-                    GodLevel = account.UserLevel;
-                else
-                    GodLevel = 200; // local or HG
+                if (account != null)
+                {
+                    if (account.UserLevel > 0)
+                        GodLevel = account.UserLevel;
+                    else
+                        GodLevel = 200;
+                }
             }
             else
             {