diff --git a/htools/Ganeti/Daemon.hs b/htools/Ganeti/Daemon.hs
index f87e49c5ce7e5a32e2ceb472bfab91b1c4ef30d8..2e9e59e9bce355696ae27a1b3927ed37fd06eb3a 100644
--- a/htools/Ganeti/Daemon.hs
+++ b/htools/Ganeti/Daemon.hs
@@ -371,10 +371,11 @@ fullPrep daemon opts syslog check_result prep_fn = do
                   then Nothing
                   else Just $ daemonLogFile daemon
       pidfile = daemonPidFile daemon
-  setupLogging logfile (daemonName daemon) (optDebug opts) True False syslog
+      dname = daemonName daemon
+  setupLogging logfile dname (optDebug opts) True False syslog
   _ <- describeError "writing PID file; already locked?"
          Nothing (Just pidfile) $ writePidFile pidfile
-  logNotice "starting"
+  logNotice $ dname ++ " daemon startup"
   prep_fn opts check_result
 
 -- | Inner daemon function.
@@ -404,6 +405,7 @@ handlePrepErr fd err = do
     -- better (safer) than trying to convert this into a full handle
     Just fd' -> fdWrite fd' msg >> return ()
     Nothing  -> hPutStrLn stderr (daemonStartupErr msg)
+  logError msg
   exitWith $ ExitFailure 1
 
 -- | Close a file descriptor.