1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
index 4bd0b45..2306bce 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
@@ -359,6 +359,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
         string FormatException(Exception e, Dictionary<KeyValuePair<int,int>,
                 KeyValuePair<int,int>> LineMap)
         {
+            if (e.InnerException == null)
+                return e.ToString();
+
             string message = "Runtime error:\n" + e.InnerException.StackTrace;
             string[] lines = message.Split(new char[] {'\n'});