diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
index 24a76f719c..0a1634118a 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
@@ -129,6 +129,10 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
             get { return map[x, y]; }
             set
             {
+                // Will "fix" terrain hole problems. Although not fantastically.
+                if(Double.IsNaN(value) || Double.IsInfinity(value))
+                    return;
+
                 if (map[x, y] != value)
                 {
                     taint[x / 16, y / 16] = true;