Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.311 -r1.312
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	10 Nov 2008 09:08:01 -0000	1.311
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	15 Nov 2008 00:27:04 -0000	1.312
@@ -434,14 +434,14 @@
   }
 
   FormPage instproc map_value {map_type value} {
-    #my log "map_value $map_type, $value"
-    if {$map_type eq "category"} {
+    my log "map_value $map_type, $value"
+    if {$map_type eq "category" && $value ne ""} {
       #
       # map a category item
       #
       array set cm [my set __category_map]
       return $cm($value)
-    } elseif {$map_type eq "party_id"} {
+    } elseif {$map_type eq "party_id" && $value ne ""} {
       #
       # map a party_id
       #
Index: openacs-4/packages/xowiki/www/admin/export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/export.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/xowiki/www/admin/export.tcl	4 Oct 2008 19:15:45 -0000	1.14
+++ openacs-4/packages/xowiki/www/admin/export.tcl	15 Nov 2008 00:27:05 -0000	1.15
@@ -78,8 +78,11 @@
 
 foreach item_id [array names items] {
   ns_log notice "--exporting $item_id [$item_id name]"
-  #append content [$item_id marshall] \n
-  ns_write "[$item_id marshall] \n" 
+  if {[catch {set obj [$item_id marshall]} errorMsg]} {
+    ns_log error "Error while exporting $item_id [$item_id name]\n$errorMsg"
+  } else {
+    ns_write "$obj\n" 
+  }
 }
 
 #ns_return 200 text/plain $content