diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5e6ac04..60572294 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 - Docker based image updated for Python 3.14.3 slim trixie via PR [#325](https://github.com/rojopolis/spellcheck-github-actions/pull/325) from Dependabot.
 
+- Cleaned up the error messaging, to address issue [#328](https://github.com/rojopolis/spellcheck-github-actions/issues/328) from @akohout-hai, the error message is now more correct, but not improved in general
+
 ## 0.59.0, 2026-03-02, feature release, update recommended
 
 - Improvements have been added to the docker entrypoint, based on a PR from @akohout-hai which fixes an issue with handling of spaces in files names and directories, see PR [#322](https://github.com/rojopolis/spellcheck-github-actions/pull/322) for details. This is his first contribution to the project and I want to thank him for his contribution, which is highly appreciated.
diff --git a/entrypoint.sh b/entrypoint.sh
index ae4213b6..3fbbe11c 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -177,13 +177,9 @@ fi
 echo "----------------------------------------------------------------"
 
 if [ -n "$GITHUB_ACTIONS" ]; then
-    test "$EXITCODE" -gt 1 && echo "::error title=Spelling check::Spelling check action failed, please check diagnostics";
-
-    test "$EXITCODE" -eq 1 && echo "::error title=Spelling errors::Files in repository contain spelling errors";
+    test "$EXITCODE" -gt 0 && echo "::error title=Error::Files in repository contain spelling errors or or spelling check action failed, please check diagnostics";
 else
-    test "$EXITCODE" -gt 1 && echo "Spelling check action failed, please check diagnostics";
-
-    test "$EXITCODE" -eq 1 && echo "Files in repository contain spelling errors";
+    test "$EXITCODE" -gt 0 && echo "Files in repository contain spelling errors or spelling check action failed, please check diagnostics";
 fi
 
 exit "$EXITCODE"