diff --git a/collects/setup/main.ss b/collects/setup/main.ss
index e3114dc6f7..ef60b152c2 100644
--- a/collects/setup/main.ss
+++ b/collects/setup/main.ss
@@ -129,7 +129,6 @@
 		           ;; If something goes wrong, of course, give up on .zo files.
                            (parameterize ([uncaught-exception-handler
                                            (lambda (exn)
-                                             (printf "~s\n" (exn-message exn))
                                              (when (exn:break? exn) (exit 1))
                                              (if skip-zo?
                                                  (escape
diff --git a/collects/setup/scribble.ss b/collects/setup/scribble.ss
index 5b4ab3cac5..1cb1e5ebe2 100644
--- a/collects/setup/scribble.ss
+++ b/collects/setup/scribble.ss
@@ -289,10 +289,13 @@
                                  (std-path "scheme.css")
                                  (std-path "scribble-common.js")))
                          null)]
-        ;; up-path is #t, which makes it go to the (user's) start page
-        ;; (using cookies) -- except when it is the start page itself
-        ;; (one of the two)
-        [up-path     (not root?)]
+        ;; For main-directory, non-start files, up-path is #t, which makes the
+        ;; "up" link go to the (user's) start page using cookies. For other files,
+        ;; 
+        [up-path     (and (not root?)
+                          (if main?
+                              #t
+                              (build-path (find-user-doc-dir) "index.html")))]
         [search-box? #t]))))
 
 (define (pick-dest latex-dest doc)