diff --git a/collects/planet2/lib.rkt b/collects/planet2/lib.rkt
index 0e981d21af..8aa04ac649 100644
--- a/collects/planet2/lib.rkt
+++ b/collects/planet2/lib.rkt
@@ -684,13 +684,15 @@
   (define to-update (filter-map update-package pkgs))
   (cond
     [(empty? to-update)
-     (printf "No updates available\n")]
+     (printf "No updates available\n")
+     #f]
     [else
      (install-cmd
       #:updating? #t
       #:pre-succeed (λ () (for-each (compose remove-package car) to-update))
       #:dep-behavior dep-behavior
-      (map cdr to-update))]))
+      (map cdr to-update))
+     #t]))
 
 (define (show-cmd)
   (let ()
@@ -805,7 +807,7 @@
         (#:dep-behavior dep-behavior/c
                         #:all? boolean?
                         #:deps? boolean?)
-        void)]
+        boolean?)]
   [remove-packages
    (->* ((listof string?))
         (#:auto? boolean?
diff --git a/collects/planet2/main.rkt b/collects/planet2/main.rkt
index 6ea113c536..e613f46588 100644
--- a/collects/planet2/main.rkt
+++ b/collects/planet2/main.rkt
@@ -50,11 +50,11 @@
   #:args pkgs
   (parameterize ([current-install-system-wide? installation])
     (with-package-lock
-     (update-packages pkgs
-                      #:all? all
-                      #:dep-behavior deps
-                      #:deps? update-deps)
-     (setup dont-setup)))]
+     (when (update-packages pkgs
+                            #:all? all
+                            #:dep-behavior deps
+                            #:deps? update-deps)
+       (setup dont-setup))))]
  [remove
   "Remove packages"
   [#:bool dont-setup () "Don't run 'raco setup' after changing packages (generally not a good idea)"]