--- deliantra/server/common/arch.C	2007/04/17 18:40:31	1.53
+++ deliantra/server/common/arch.C	2007/04/17 18:59:05	1.54
@@ -332,8 +332,10 @@
 
   for (;;)
     {
-      archetype *at = get (f.get_str ());
       object *op = object::create ();
+      archetype *at = get (f.get_str ());
+      f.get (op->name);
+      f.next ();
 
       if (!op->parse_kv (f))
         goto fail;
@@ -344,7 +346,12 @@
         break;
 
       f.next ();
-      assert (f.kw == KW_object);
+
+      if (f.kw != KW_object)
+        {
+          f.parse_error ("more object");
+          goto fail;
+        }
     }
 
   {