--- deliantra/server/common/object.C	2007/01/21 21:28:27	1.120
+++ deliantra/server/common/object.C	2007/01/23 03:17:55	1.121
@@ -672,8 +672,7 @@
 
 object::~object ()
 {
-  if (index)
-    unlink ();
+  unlink ();
 
   free_key_values (this);
 }
@@ -692,7 +691,9 @@
 
 void object::unlink ()
 {
-  assert (index);//D
+  if (!index)
+    return;
+
   objects.erase (this);
   refcnt_dec ();
 }