1 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index d2dce6b..7836199 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -179,8 +179,15 @@ namespace SimpleApp
 
         public virtual void SendRegionHandshake(RegionInfo regionInfo)
         {
-            this.OnRegionHandShakeReply(this);
-            this.OnCompleteMovementToRegion();
+            if (OnRegionHandShakeReply != null)
+            {
+                this.OnRegionHandShakeReply(this);
+            }
+
+            if (OnCompleteMovementToRegion != null)
+            {
+                this.OnCompleteMovementToRegion();
+            }
         }
 
         private void Update( )