diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
index 8ffd1250b8..02519197e0 100644
--- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
@@ -2744,8 +2744,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
             waterlevel = baseheight;
         }
 
-        [HandleProcessCorruptedStateExceptions]
-        public override void Dispose()
+         public override void Dispose()
         {
             lock(SimulationLock)
                 lock(OdeLock)
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
index 5df6ca1585..86429b5870 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
@@ -2210,7 +2210,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                     m_terrainHeightsHandler.Free();
                 m_terrainHeights = null;
 
-                if (m_contactsHandler != null && m_contactsHandler.IsAllocated)
+                if (m_contactsHandler.IsAllocated)
                 {
                     m_contactsHandler.Free();
                     ContactgeomsArray = IntPtr.Zero;
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
index 9792b06c9a..01ec1e8ee8 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
@@ -100,9 +100,6 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
 
         public unsafe Mesh Scale(Vector3 scale)
         {
-            if (m_verticesPtr == null || m_indicesPtr == null)
-                return null;
-
             Mesh result = new Mesh(false);
 
             float x = scale.X;