1 files changed, 4 insertions, 12 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 57d3e5c..399cbf6 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -95,22 +95,14 @@ namespace OpenSim.Region.Environment.Scenes
                 // If we're not doing the initial set
                 // Then we've got to remove the previous
                 // event handler
-                try
-                {
+
+                if (_PhyScene != null) 
                     _PhyScene.OnPhysicsCrash -= physicsBasedCrash;
-                }
-                catch (NullReferenceException)
-                {
-                    // This occurs when storing to _PhyScene the first time.
-                    // Is there a better way to check the event handler before
-                    // getting here
-                    // This can be safely ignored.  We're setting the first inital
-                    // there are no event handler's registered.
-                }
 
                 _PhyScene = value;
 
-                _PhyScene.OnPhysicsCrash += physicsBasedCrash;
+                if (_PhyScene != null)
+                    _PhyScene.OnPhysicsCrash += physicsBasedCrash;
             }
         }