diff --git a/OpenMetaverse/ImportExport/Collada.cs b/OpenMetaverse/ImportExport/Collada.cs
index c2320edd..06ebef6d 100644
--- a/OpenMetaverse/ImportExport/Collada.cs
+++ b/OpenMetaverse/ImportExport/Collada.cs
@@ -37,7 +37,7 @@
 // 
 // This source code was auto-generated by xsd, Version=4.0.30319.17929.
 // 
-namespace OpenMetaverse.ImportExport
+namespace OpenMetaverse.ImportExport.Collada14
 {
     using System.Xml.Serialization;
     using System.Text.RegularExpressions;
diff --git a/OpenMetaverse/ImportExport/ColladalLoader.cs b/OpenMetaverse/ImportExport/ColladalLoader.cs
index bed2570c..2324c06c 100644
--- a/OpenMetaverse/ImportExport/ColladalLoader.cs
+++ b/OpenMetaverse/ImportExport/ColladalLoader.cs
@@ -32,6 +32,7 @@ using System.IO;
 using System.Xml;
 using System.Drawing;
 using System.Xml.Serialization;
+using OpenMetaverse.ImportExport.Collada14;
 using OpenMetaverse.Rendering;
 using OpenMetaverse.Imaging;
 
diff --git a/OpenMetaverse/ImportExport/ModelUploader.cs b/OpenMetaverse/ImportExport/ModelUploader.cs
index 59e708c9..99758f86 100644
--- a/OpenMetaverse/ImportExport/ModelUploader.cs
+++ b/OpenMetaverse/ImportExport/ModelUploader.cs
@@ -184,6 +184,12 @@ namespace OpenMetaverse.ImportExport
         {
             PrepareUpload((result =>
             {
+                if (result == null && callback != null)
+                {
+                    callback(null);
+                    return;
+                }
+
                 if (result is OSDMap)
                 {
                     var res = (OSDMap)result;
@@ -218,6 +224,7 @@ namespace OpenMetaverse.ImportExport
                 null == (url = Client.Network.CurrentSim.Caps.CapabilityURI("NewFileAgentInventory")))
             {
                 Logger.Log("Cannot upload mesh, no connection or NewFileAgentInventory not available", Helpers.LogLevel.Warning);
+                if (callback != null) callback(null);
                 return;
             }