diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs
index 3facc0fd58..3a674b148c 100644
--- a/OpenSim/Capabilities/Caps.cs
+++ b/OpenSim/Capabilities/Caps.cs
@@ -174,9 +174,9 @@ namespace OpenSim.Framework.Capabilities
         public void Dispose(bool disposing)
         {
             Flags = CapsFlags.None;
-            DeregisterHandlers();
             if (m_capsActive != null)
             {
+                DeregisterHandlers();
                 m_capsActive.Dispose();
                 m_capsActive = null;
             }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/UpdateItemAsset.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/UpdateItemAsset.cs
index 416e32c614..40272d78f2 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/UpdateItemAsset.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/UpdateItemAsset.cs
@@ -284,7 +284,8 @@ namespace OpenSim.Region.ClientStack.Linden
 
             m_timeout = new Timer();
             m_timeout.Elapsed += Timeout;
-            m_timeout.Interval = 1000;
+            m_timeout.AutoReset = false;
+            m_timeout.Interval = 30000;
             m_timeout.Start();
         }
 
@@ -386,7 +387,8 @@ namespace OpenSim.Region.ClientStack.Linden
             m_remoteAddress = address;
             m_timeout = new Timer();
             m_timeout.Elapsed += Timeout;
-            m_timeout.Interval = 1000;
+            m_timeout.AutoReset = false;
+            m_timeout.Interval = 30000;
             m_timeout.Start();
         }
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 604599ff83..49a0ccbfbc 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -171,7 +171,8 @@ namespace OpenSim.Region.ClientStack.Linden
             m_assetCache = cache;
             m_timeout = new Timer();
             m_timeout.Elapsed += Timeout;
-            m_timeout.Interval = 1000;
+            m_timeout.AutoReset = false;
+            m_timeout.Interval = 30000;
             m_timeout.Start();
         }