Index: openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl,v
diff -u -N -r1.3.2.3 -r1.3.2.4
--- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	23 Mar 2016 11:57:25 -0000	1.3.2.3
+++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	11 Apr 2016 14:20:30 -0000	1.3.2.4
@@ -103,7 +103,8 @@
         }
       }
     }
-  }   
+  }
+  
   #
   # BootstrapNavbarDropdownMenuItem
   #  
Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -N -r1.134.2.4 -r1.134.2.5
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	11 Mar 2016 09:59:58 -0000	1.134.2.4
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	11 Apr 2016 14:20:30 -0000	1.134.2.5
@@ -257,8 +257,10 @@
       $data name $name
       set name [$data build_name -nls_language [$data form_parameter nls_language {}]]
     }
-    set prefixed_page_p [expr {![$data is_folder_page] && ![$data is_link_page]}]
-    set name [::$package_id normalize_name -with_prefix $prefixed_page_p $name]
+    if {$name ne ""} {
+      set prefixed_page_p [expr {![$data is_folder_page] && ![$data is_link_page]}]
+      set name [::$package_id normalize_name -with_prefix $prefixed_page_p $name]
+    }
 
     #$data msg "validate: old='$old_name', new='$name'"
     if {$name eq $old_name && $name ne ""} {
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -N -r1.327.2.16 -r1.327.2.17
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	23 Mar 2016 11:57:25 -0000	1.327.2.16
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	11 Apr 2016 14:20:30 -0000	1.327.2.17
@@ -238,7 +238,6 @@
         ::xowiki::FormPage get_instance_from_db -item_id $id
         $f copy_content_vars -from_object $id
         $f item_id $id
-
         $f save
       }
     }