@@ -1523,11 +1523,14 @@
 
 ;;======================================================================
 ;; Exit and clean up
 ;;======================================================================
 
-(if *runremote* (close-all-connections!))
+;; if *runremote* is defined, close connections, otherwise - trust that it was
+;; taken care of.
+;;
+(if (common:get-remote #f #f)(close-all-connections!))
 
 (if (not *didsomething*)
     (debug:print 0 help))
 
 (set! *time-to-exit* #t)