1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 5e7eae5..5b78617 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -286,12 +286,20 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
+        /// <summary>
+        /// Get a module commander
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns>The module commander, null if no module commander with that name was found</returns>
         public ICommander GetCommander(string name)
         {
             lock (m_moduleCommanders)
             {
-                return m_moduleCommanders[name];
+                if (m_moduleCommanders.ContainsKey(name))
+                    return m_moduleCommanders[name];
             }
+            
+            return null;
         }
 
         public Dictionary<string, ICommander> GetCommanders()