diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 65aefc6076..116284819b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -103,6 +103,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             bool mergeOar = false;
             bool mergeReplaceObjects = false;
             bool skipAssets = false;
+            bool forceAssets = false;
             bool mergeTerrain = false;
             bool mergeParcels = false;
             bool noObjects = false;
@@ -118,6 +119,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             options.Add("m|merge", delegate(string v) { mergeOar = (v != null); });
             options.Add("mergeReplaceObjects", delegate (string v) { mergeReplaceObjects = (v != null); });
             options.Add("s|skip-assets", delegate(string v) { skipAssets = (v != null); });
+            options.Add("force-assets", delegate(string v) { forceAssets = (v != null); });
             options.Add("merge-terrain", delegate(string v) { mergeTerrain = (v != null); });
             options.Add("force-terrain", delegate (string v) { mergeTerrain = (v != null); });   // downward compatibility
             options.Add("forceterrain", delegate (string v) { mergeTerrain = (v != null); });   // downward compatibility
@@ -216,6 +218,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             if (mergeOar) archiveOptions.Add("merge", null);
             if (skipAssets) archiveOptions.Add("skipAssets", null);
+            if (forceAssets) archiveOptions.Add("forceAssets", null);
             if (mergeReplaceObjects) archiveOptions.Add("mReplaceObjects", null);
             if (mergeTerrain) archiveOptions.Add("merge-terrain", null);
             if (mergeParcels) archiveOptions.Add("merge-parcels", null);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 440723db6d..e1d822003b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -150,7 +150,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                     if(asset == null)
                     {
-                        m_notFoundAssetUuids.Add(new UUID(thiskey));
+                        m_notFoundAssetUuids.Add(kvp.Key);
                         continue;
                     }