--- deliantra/server/common/loader.C	2009/09/17 01:57:31	1.132
+++ deliantra/server/common/loader.C	2009/10/23 03:08:34	1.135
@@ -5,18 +5,19 @@
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -995,7 +996,10 @@
                     : treasurelist::find (f.get_str ());
 
                 if (!randomitems)
-                  LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
+                  {
+                    LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
+                    randomitems = treasurelist::get (shstr_none); // avoid crashes
+                  }
               }
             else
               randomitems = 0;
@@ -1304,7 +1308,8 @@
    * will get taken care of the copy_to method.
    */
 
-  f.put (KW_uuid, op->uuid.c_str ());
+  if (op->uuid)
+    f.put (KW_uuid, op->uuid.c_str ());
 
 #define CMP_OUT(v)    if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
 #define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)