From 90eaabec6f896e04d3b46ea91e7848cee983b16e Mon Sep 17 00:00:00 2001
From: "Douglas R. Miles" <logicmoo@gmail.com>
Date: Wed, 30 May 2012 19:16:32 -0700
Subject: [PATCH] Guard against Assembly.GetEntryAssembly() being null

---
 OpenMetaverse/Helpers.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/OpenMetaverse/Helpers.cs b/OpenMetaverse/Helpers.cs
index 86b2135e..f6aab6a8 100644
--- a/OpenMetaverse/Helpers.cs
+++ b/OpenMetaverse/Helpers.cs
@@ -458,8 +458,15 @@ namespace OpenMetaverse
         public static System.IO.Stream GetResourceStream(string resourceName, string searchPath)
         {
             if (searchPath != null)
-            {
-                string filename = System.IO.Path.Combine(System.IO.Path.Combine(System.IO.Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), searchPath), resourceName);
+            {
+                Assembly gea = Assembly.GetEntryAssembly();
+                string dirname = ".";
+                if (gea != null)
+                {
+                    dirname = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(gea.Location), searchPath);
+                }
+
+                string filename = System.IO.Path.Combine(dirname, resourceName);
                 try
                 {
                     return new System.IO.FileStream(