diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
index 67346aef81..278af39bfa 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -53,20 +53,17 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
 
         public void Initialise(Scene scene, IConfigSource config)
         {
-            if (config.Configs["Messaging"] != null)
-            {
-                IConfig cnf = config.Configs["Messaging"];
-                if (cnf != null && cnf.GetString(
-                        "MessageTransferModule", "MessageTransferModule") !=
-                        "MessageTransferModule")
-                    return;
+            IConfig cnf = config.Configs["Messaging"];
+            if (cnf != null && cnf.GetString(
+                    "MessageTransferModule", "MessageTransferModule") !=
+                    "MessageTransferModule")
+                return;
 
-                cnf = config.Configs["Startup"];
-                if (cnf != null)
-                    m_Gridmode = cnf.GetBoolean("gridmode", false);
+            cnf = config.Configs["Startup"];
+            if (cnf != null)
+                m_Gridmode = cnf.GetBoolean("gridmode", false);
 
-                m_Enabled = true;
-            }
+            m_Enabled = true;
 
             lock (m_Scenes)
             {
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 7929b9158c..27c7014a56 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -827,8 +827,9 @@ namespace OpenSim.Region.Environment.Modules.World.Land
                 {
                     landData.OwnerPrims += prim_count;
                 }
-                else if (obj.GroupID == landData.GroupID ||
-                         prim_owner  == landData.GroupID)
+                else if ((obj.GroupID == landData.GroupID ||
+                          prim_owner  == landData.GroupID) &&
+                          landData.GroupID != UUID.Zero)
                 {
                     landData.GroupPrims += prim_count;
                 }