@@ -467,11 +467,11 @@
       (exit-handler (lambda (#!optional (exit-code 0))
 		      (printf "Preparing to exit with exit code ~A ...\n" exit-code)
 		      (for-each
 		       
 		       (lambda (pid)
-			 (common:debug-handle-exceptions #t
+			 (handle-exceptions
 			  exn
 			  #t
 			  (let-values (((pid-val exit-status exit-code) (process-wait pid #t)))
 				      (if (or (eq? pid-val pid)
 					      (eq? pid-val 0))
@@ -538,11 +538,11 @@
 		    (debug:print-info 0 *default-log-port* "No cached megatest or runconfigs files found. None removed.")
 		    (begin
 		      (debug:print-info 0 *default-log-port* "Removing cached files:\n    " (string-intersperse files "\n    "))
 		      (for-each 
 		       (lambda (f)
-			 (common:debug-handle-exceptions #t
+			 (handle-exceptions
 			     exn
 			     (debug:print 0 *default-log-port* "WARNING: Failed to remove file " f)
 			   (delete-file f)))
 		       files))))
 	      (debug:print-error 0 *default-log-port* "-clean-cache requires -runname."))