2 files changed, 22 insertions, 12 deletions

diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs
index 5723739..098466d 100644
--- a/OpenSim/Region/ClientStack/ClientStackManager.cs
+++ b/OpenSim/Region/ClientStack/ClientStackManager.cs
@@ -48,22 +48,32 @@ namespace OpenSim.Region.Environment
         {
             m_log.Info("[CLIENTSTACK]: Attempting to load " + dllName);
 
-            plugin = null;
-            pluginAssembly = Assembly.LoadFrom(dllName);
-
-            foreach (Type pluginType in pluginAssembly.GetTypes())
+            try
             {
-                if (pluginType.IsPublic)
-                {
-                    Type typeInterface = pluginType.GetInterface("IClientNetworkServer", true);
+                plugin = null;
+                pluginAssembly = Assembly.LoadFrom(dllName);
 
-                    if (typeInterface != null)
+                foreach (Type pluginType in pluginAssembly.GetTypes())
+                {
+                    if (pluginType.IsPublic)
                     {
-                        m_log.Info("[CLIENTSTACK]: Added IClientNetworkServer Interface");
-                        plugin = pluginType;
-                        return;
+                        Type typeInterface = pluginType.GetInterface("IClientNetworkServer", true);
+
+                        if (typeInterface != null)
+                        {
+                            m_log.Info("[CLIENTSTACK]: Added IClientNetworkServer Interface");
+                            plugin = pluginType;
+                            return;
+                        }
                     }
                 }
+            } catch (ReflectionTypeLoadException e)
+            {
+                foreach(Exception e2 in e.LoaderExceptions)
+                {
+                    m_log.Error(e2.ToString());
+                }
+                throw e;
             }
         }
         
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c953228..6ad4c2d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -664,7 +664,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_log.DebugFormat(
                 "[CLIENT]: Entered main packet processing loop for {0} {1}", FirstName, LastName);
 
-            while (true)
+            while (IsActive)
             {
                 LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue();