--- deliantra/server/common/loader.C	2006/09/03 22:45:55	1.1
+++ deliantra/server/common/loader.C	2006/09/04 11:07:59	1.2
@@ -986,11 +986,15 @@
             return LL_EOF;
 
           case KW_ERROR:
-            set_ob_key_value(op, thawer.line, thawer.last_value, true);
+            set_ob_key_value (op, thawer.line, thawer.last_value, true);
             //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D
 
-            // skip line, ugly
-            thawer.line = thawer.last_value + strlen (thawer.last_value) + 1;
+            //TODO: skip line, ugly, factor parsing better
+            if (thawer.last_value)
+              thawer.line = thawer.last_value;
+
+            thawer.line += strlen (thawer.line) + 1;
+
             break;
 
           default:
@@ -1274,7 +1278,7 @@
     for (i = 0; i <= NUM_FLAGS; i++)
       if (flag_names [i]
           && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i)))
-        f.put (flag_names [i], QUERY_FLAG (op, i) ? "1" : 0);
+        f.put (flag_names [i], QUERY_FLAG (op, i) ? "1" : "0");
 
   /* Save body locations */
   for (i = 0; i < NUM_BODY_LOCATIONS; i++)