1 files changed, 11 insertions, 1 deletions

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index a1b3960..acfc49c 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -118,7 +118,17 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 
             if (hgrid)
             {
-                HGOpenSimNode hgNode = (HGOpenSimNode)openSim;
+                HGOpenSimNode hgNode = null;
+                try
+                {
+                    hgNode = (HGOpenSimNode)openSim;
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[CreateComms] " + e.Message);
+                    m_log.Error("[CreateComms] The OpenSim application class was : " + openSim.ToString());
+                    Environment.Exit(1);
+                }
 
                 // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
                 if (m_openSim.ConfigurationSettings.Standalone)