1 files changed, 19 insertions, 16 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index c37fcba..b9559c0 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -28,22 +28,25 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
 
         public void Initialise(OpenSimMain openSim)
         {
-             IConfig remoteConfig = openSim.ConfigSource.Configs["RemoteAdmin"];
-             if (remoteConfig != null)
-             {
-                 if (remoteConfig.GetBoolean("enabled", false))
-                 {
-                     System.Console.WriteLine("RADMIN", "Remote Admin Plugin Enabled");
-
-                     m_app = openSim;
-                     m_httpd = openSim.HttpServer;
-
-                     m_httpd.AddXmlRPCHandler("admin_create_region", XmlRpcCreateRegionMethod);
-                     m_httpd.AddXmlRPCHandler("admin_shutdown", XmlRpcShutdownMethod);
-                     m_httpd.AddXmlRPCHandler("admin_broadcast", XmlRpcAlertMethod);
-                     m_httpd.AddXmlRPCHandler("admin_restart", XmlRpcRestartMethod);
-                 }
-             }
+            try
+            {
+                if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
+                {
+                    OpenSim.Framework.Console.MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled");
+
+                    m_app = openSim;
+                    m_httpd = openSim.HttpServer;
+
+                    m_httpd.AddXmlRPCHandler("admin_create_region", XmlRpcCreateRegionMethod);
+                    m_httpd.AddXmlRPCHandler("admin_shutdown", XmlRpcShutdownMethod);
+                    m_httpd.AddXmlRPCHandler("admin_broadcast", XmlRpcAlertMethod);
+                    m_httpd.AddXmlRPCHandler("admin_restart", XmlRpcRestartMethod);
+                }
+            }
+            catch (NullReferenceException)
+            {
+                // Ignore.
+            }
         }
 
         public XmlRpcResponse XmlRpcRestartMethod(XmlRpcRequest request)