diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 6510a0cc73..4efcb63346 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -435,8 +435,9 @@ namespace OpenSim.Region.Framework.Scenes
/// null if there is no registered module implementing that interface
public T RequestModuleInterface()
{
- if (ModuleInterfaces.ContainsKey(typeof(T)))
+ if (ModuleInterfaces.ContainsKey(typeof(T)) && (ModuleInterfaces[typeof(T)].Count > 0))
{
+ m_log.Debug("[XXX] RequestModuleInterface " + typeof(T).ToString() + " size: " + ModuleInterfaces[typeof(T)].Count);
return (T)ModuleInterfaces[typeof(T)][0];
}
else