From b05409b03fcea12d8cd555a49fcb7f4215f74474 Mon Sep 17 00:00:00 2001
From: lbsa71 <lbsa71@hotmail.com>
Date: Wed, 13 Feb 2008 20:51:59 +0000
Subject: [PATCH] * Minor guard for null case. [Provided by openlifegrid.com]

---
 OpenSim/Grid/GridServer/GridManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 49b9aa2764..d784bc88b8 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -317,8 +317,8 @@ namespace OpenSim.Grid.GridServer
             if (OldSim == null || OldSim.UUID == TheSim.UUID)
             {
                 if ((OldSim == null && TheSim.regionRecvKey == config.SimSendKey && 
-                    TheSim.regionRecvKey == config.SimRecvKey) || 
-                    (OldSim.regionRecvKey == TheSim.regionRecvKey &&
+                    TheSim.regionRecvKey == config.SimRecvKey) ||
+                    (OldSim != null && OldSim.regionRecvKey == TheSim.regionRecvKey &&
                     OldSim.regionSendKey == TheSim.regionSendKey))
                 {
                     m_log.Info("[GRID]: Adding region " + TheSim.regionLocX + " , " + TheSim.regionLocY + " , " +