1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index 1b7eb97..339f1f9 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -127,7 +127,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
                 return;
             }
 
-            GridInstantMessage im = new GridInstantMessage(client.Scene,
+            IScene scene = client == null ? null : client.Scene;
+            GridInstantMessage im = new GridInstantMessage(scene,
                     fromAgentID, fromAgentName, fromAgentSession, toAgentID,
                     dialog, fromGroup, message, imSessionID,
                     offline != 0 ? true : false, Position,