--- deliantra/server/common/arch.C	2007/04/19 19:24:25	1.57
+++ deliantra/server/common/arch.C	2007/05/17 21:32:08	1.60
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -353,6 +353,8 @@
       if (!op->parse_kv (f))
         goto fail;
 
+      op->post_load_check ();
+
       parts.push_back (std::make_pair (at, op));
 
       if (f.kw != KW_more)
@@ -528,6 +530,12 @@
 archetype *
 archetype::get (const char *name)
 {
+  if (!name)
+    {
+      LOG (llevError, "null archetype requested\n");
+      name = "(null)";
+    }
+
   archetype *at = find (name);
 
   if (!at)