From 9b803531c80ce944815afaadab3e091f787fd3f1 Mon Sep 17 00:00:00 2001
From: Sylvester Kaczmarek
 <16242628+sylvesterkaczmarek@users.noreply.github.com>
Date: Thu, 13 Aug 2026 11:54:39 +0100
Subject: [PATCH] Fix #2446, clarify startup token count message

---
 modules/es/fsw/src/cfe_es_startupscript.c | 4 +++-
 modules/es/ut-coverage/es_UT.c            | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/es/fsw/src/cfe_es_startupscript.c b/modules/es/fsw/src/cfe_es_startupscript.c
index 2712d38f9..14f5a2673 100644
--- a/modules/es/fsw/src/cfe_es_startupscript.c
+++ b/modules/es/fsw/src/cfe_es_startupscript.c
@@ -334,7 +334,9 @@ int32 CFE_ES_ParseFileEntry(const char **TokenList, uint32 NumTokens)
     */
     if (NumTokens < 8)
     {
-        CFE_ES_WriteToSysLog("%s: Invalid ES Startup file entry: %u\n", __func__, (unsigned int)NumTokens);
+        CFE_ES_WriteToSysLog("%s: Invalid ES Startup file entry: NumTokens = %u, expected at least 8\n",
+                             __func__,
+                             (unsigned int)NumTokens);
         return CFE_ES_BAD_ARGUMENT;
     }
 
diff --git a/modules/es/ut-coverage/es_UT.c b/modules/es/ut-coverage/es_UT.c
index ad6138e4e..c4cb997e8 100644
--- a/modules/es/ut-coverage/es_UT.c
+++ b/modules/es/ut-coverage/es_UT.c
@@ -659,6 +659,7 @@ void TestApps(void)
     /* Test parsing the startup script with an invalid argument passed in */
     ES_ResetUnitTest();
     UtAssert_INT32_EQ(CFE_ES_ParseFileEntry(NULL, 0), CFE_ES_BAD_ARGUMENT);
+    CFE_UtAssert_PRINTF("NumTokens = 0, expected at least 8");
 
     /* Test application loading and creation with a task creation failure */
     ES_ResetUnitTest();