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 -r1.133 -r1.134
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	27 Oct 2014 16:42:05 -0000	1.133
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	24 Jun 2015 19:24:44 -0000	1.134
@@ -153,11 +153,13 @@
                -folder_id $folder_id \
                -with_subtypes false \
                -select_attributes {name}]
+    set lpairs ""
     xo::dc foreach get_page_templates $q {
       lappend lpairs [list $name $item_id]
-    } if_no_rows {
-      lappend lpairs [list "(No Page Template available)" ""]
     }
+    if {$lpairs eq ""} {
+      return [list "(No Page Template available)" ""]
+    }
     return $lpairs
   }