diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 9d47f8703e..8a556d98f6 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -479,7 +479,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (client is IClientCore)
             {
                 handlerClientConnect = OnClientConnect;
-                handlerClientConnect((IClientCore) client);
+                if (handlerClientConnect != null)
+                    handlerClientConnect((IClientCore)client);
             }
         }