diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index a4801ad5fa..bfa97637ad 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -323,7 +323,14 @@ namespace OpenSim.Region.Environment.Scenes
             foreach (string assembly in assemblies)
             {
                 string fn = Path.GetFileName(assembly);
+                if (fn == String.Empty)
+                    continue;
+
                 FileInfo fi = new FileInfo(assembly);
+
+                if (fi == null)
+                    continue;
+
                 Byte[] data = new Byte[fi.Length];
 
                 FileStream fs = File.Open(assembly, FileMode.Open, FileAccess.Read);