1 files changed, 6 insertions, 3 deletions

diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index 4ca4e67..9cecf42 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -75,9 +75,12 @@ namespace OpenSim.Framework
                 offline = 0;
             Position = _position;
             binaryBucket = _binaryBucket;
-            
-            ParentEstateID = scene.RegionInfo.EstateSettings.ParentEstateID;
-            RegionID = scene.RegionInfo.RegionSettings.RegionUUID.Guid;
+
+            if (scene != null)
+            {
+                ParentEstateID = scene.RegionInfo.EstateSettings.ParentEstateID;
+                RegionID = scene.RegionInfo.RegionSettings.RegionUUID.Guid;
+            }
             timestamp = (uint)Util.UnixTimeSinceEpoch();
         }