Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	7 Aug 2017 23:47:46 -0000	1.26
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	17 Dec 2017 20:36:03 -0000	1.27
@@ -218,21 +218,21 @@
         ns_log Debug "Installer serving $path"
         ad_try {
             rp_serve_abstract_file $path
-        } notfound val {
-            install_return 404 "Not found" "
-        The file you've requested, doesn't exist. Please check
+        } trap {AD EXCEPTION notfound} {val} {
+            install_return 404 "Not found" "The file you've requested, doesn't exist. Please check
         your URL and try again."
-        } redirect url {
+        } trap {AD EXCEPTION redirect} {url} {
             ad_returnredirect $url
-        } directory dir_index {
+        } trap {AD EXCEPTION directory} {dir_index} {
             set new_file [file join $path "index.html"]
             if {[file exists $new_file]} {
                 rp_serve_abstract_file $new_file
-            } 
-            set new_file [file join $path "index.adp"]
-            if {[file exists $new_file]} {
-                rp_serve_abstract_file $new_file
-            } 
+            } else {
+                set new_file [file join $path "index.adp"]
+                if {[file exists $new_file]} {
+                    rp_serve_abstract_file $new_file
+                }
+            }
         }
     }
 }