diff --git a/tools/asdf-tools b/tools/asdf-tools
index 7b3b989860c90cd049a2be86885dce0a626b8ccc..48f6366aed80cf64111104a3310cc54ca08d9db0 100755
--- a/tools/asdf-tools
+++ b/tools/asdf-tools
@@ -20,5 +20,7 @@
   (let ((*standard-output* (make-broadcast-stream)))
     (ql:quickload :asdf-tools)))
 
+(in-package :asdf-tools)
+
 ;;; Actually run the stuff!
-(uiop:restore-image :entry-point 'asdf-tools::entry-point)
+(restore-image :entry-point 'entry-point :lisp-interaction nil)
diff --git a/tools/main.lisp b/tools/main.lisp
index 6e8982a8e071fc6c7237a7512c1a53ff70493cc0..4415156b80d9a4418699bb7114082b5e39ae4668 100644
--- a/tools/main.lisp
+++ b/tools/main.lisp
@@ -105,6 +105,4 @@ based on a list of targets"
   (process-arguments argv))
 
 (defun entry-point ()
-  (setf *lisp-interaction* nil)
-  (uiop:with-fatal-condition-handler ()
-    (main *command-line-arguments*)))
+  (main *command-line-arguments*))