diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index f9918fff26..a7e0c22d40 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -189,9 +189,9 @@ namespace OpenSim.Region.ClientStack
 
                 return;
             }
-            catch (ObjectDisposedException)
+            catch (ObjectDisposedException e)
             {
-                //m_log.Debug("[UDPSERVER]: " + e.ToString());
+                m_log.Debug("[UDPSERVER]: " + e.ToString());
                 return;
             }
 
@@ -201,9 +201,9 @@ namespace OpenSim.Region.ClientStack
             {
                 packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                
+                m_log.Debug("[UDPSERVER]: " + e.ToString());
             }
 
             if (packet != null)
diff --git a/OpenSim/Region/Environment/Modules/TerrainModule.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
similarity index 94%
rename from OpenSim/Region/Environment/Modules/TerrainModule.cs
rename to OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
index 7e163a3255..990a1e0cba 100644
--- a/OpenSim/Region/Environment/Modules/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
@@ -32,11 +32,12 @@ using System.Collections;
 using System.Collections.Generic;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
+using OpenSim.Region.Environment.Modules;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using libsecondlife;
 
-namespace OpenSim.Region.Environment.Modules
+namespace OpenSim.Region.Environment.Modules.Terrain
 {
     /// <summary>
     /// A new version of the old Channel class, simplified
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index e39fa9fc6a..4e05682899 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -31,6 +31,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Terrain;
+using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -58,6 +59,7 @@ namespace OpenSim.Region.Environment.Scenes
         protected RegionInfo m_regInfo;
 
         public TerrainEngine Terrain;
+        public ITerrainChannel Heightmap;
 
         protected EventManager m_eventManager;