From: Alan Webb <alan_webb@us.ibm.com>

  Fix null reference exception during close down of IRC module if the
  region was not actually initialized.

1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
index 0facc14..13874fa 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
@@ -148,8 +148,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             if (!enabled)
                 return;
 
+            if (region == null)
+                return;
+
             region.Close();
-            lock (m_regions) m_regions.Remove(region);
+
+            if(m_regions.Contains(region))
+            {
+                lock (m_regions) m_regions.Remove(region);
+            }
+
         }
 
         #endregion