diff --git a/src/linux/init/config.cpp b/src/linux/init/config.cpp
index 3caf1c1..ae09532 100644
--- a/src/linux/init/config.cpp
+++ b/src/linux/init/config.cpp
@@ -1034,23 +1034,17 @@ try
 
     if (Config.BootCommand.has_value())
     {
-        const int ChildPid =
-            UtilCreateChildProcess("BootCommand", [Command = Config.BootCommand.value(), SavedSignals = g_SavedSignalActions]() {
-                //
-                // Restore default signal dispositions for the child process.
-                //
+        UtilCreateChildProcess("BootCommand", [Command = Config.BootCommand.value(), SavedSignals = g_SavedSignalActions]() {
+            //
+            // Restore default signal dispositions for the child process.
+            //
 
-                THROW_LAST_ERROR_IF(UtilSetSignalHandlers(SavedSignals, false) < 0);
-                THROW_LAST_ERROR_IF(UtilRestoreBlockedSignals() < 0);
+            THROW_LAST_ERROR_IF(UtilSetSignalHandlers(SavedSignals, false) < 0);
+            THROW_LAST_ERROR_IF(UtilRestoreBlockedSignals() < 0);
 
-                execl("/bin/sh", "sh", "-c", Command.c_str(), nullptr);
-                LOG_ERROR("execl() failed, {}", errno);
-            });
-
-        if (ChildPid < 0)
-        {
-            LOG_ERROR("fork failed {}", errno);
-        }
+            execl("/bin/sh", "sh", "-c", Command.c_str(), nullptr);
+            LOG_ERROR("execl() failed, {}", errno);
+        });
     }
 
     return 0;
diff --git a/src/linux/init/init.cpp b/src/linux/init/init.cpp
index 9ac6b6d..9de2f4a 100644
--- a/src/linux/init/init.cpp
+++ b/src/linux/init/init.cpp
@@ -1333,7 +1333,6 @@ try
     if (SessionLeader < 0)
     {
         Result = -1;
-        LOG_ERROR("fork failed for session leader {}", errno);
         goto InitCreateSessionLeaderExit;
     }
 
diff --git a/src/linux/init/util.h b/src/linux/init/util.h
index 44f6522..c4adbbb 100644
--- a/src/linux/init/util.h
+++ b/src/linux/init/util.h
@@ -172,7 +172,7 @@ Return Value:
 
     if (ChildPid < 0)
     {
-        LOG_ERROR("{} failed {}", CloneFlags ? "clone" : "fork", errno);
+        LOG_ERROR("{} for {} failed {}", CloneFlags ? "clone" : "fork", ChildName, errno);
         return -1;
     }
     else if (ChildPid > 0)