1 files changed, 4 insertions, 3 deletions
diff --git a/os/log.c b/os/log.c
index 3db5c5333..f270436ae 100644
--- a/os/log.c
+++ b/os/log.c
@@ -915,9 +915,9 @@ FatalError(const char *f, ...)
     static Bool beenhere = FALSE;
 
     if (beenhere)
-        ErrorFSigSafe("\nFatalError re-entered, aborting\n");
+        ErrorFSigSafe("FatalError re-entered, aborting\n");
     else
-        ErrorFSigSafe("\nFatal server error:\n");
+        ErrorFSigSafe("Fatal server error:\n");
 
     va_start(args, f);
 
@@ -936,7 +936,8 @@ FatalError(const char *f, ...)
 #endif
     VErrorFSigSafe(f, args);
     va_end(args);
-    ErrorFSigSafe("\n");
+    if (f[strlen(f) - 1] != '\n')
+        ErrorFSigSafe("\n");
     if (!beenhere)
         OsVendorFatalError(f, args2);
     va_end(args2);