--- deliantra/server/common/arch.C	2006/11/17 19:40:53	1.26
+++ deliantra/server/common/arch.C	2006/12/12 20:53:02	1.28
@@ -405,9 +405,10 @@
 void
 first_arch_pass (object_thawer & fp)
 {
-  archetype *at, *head = NULL, *last_more = NULL;
+  archetype *head = 0, *last_more = 0;
 
-  at->clone.arch = first_archetype = at = new archetype;
+  archetype *at = new archetype;
+  at->clone.arch = first_archetype = at;
 
   while (int i = load_object (fp, &at->clone, 0))
     {
@@ -812,7 +813,7 @@
   if ((at = type_to_archetype (type)) == NULL)
     {
       LOG (llevError, "Can't clone archetype %d\n", type);
-      free_object (op);
+      op->destroy (0);
       return NULL;
     }