--- a/src/master/main.c	Sun Sep 06 22:40:21 2009 -0400
+++ b/src/master/main.c	Mon Sep 07 11:57:38 2009 -0400
@@ -152,10 +152,10 @@
 startup_fatal_handler(enum log_type type, int status,
 		      const char *fmt, va_list args)
 {
-	fputs("Fatal: ", stderr);
-	vfprintf(stderr, fmt, args);
-	fputc('\n', stderr);
+	va_list args2;
 
+	VA_COPY(args2, args);
+	fprintf(stderr, "Fatal: %s\n", t_strdup_vprintf(fmt, args2));
 	orig_fatal_callback(type, status, fmt, args);
 	abort();
 }
@@ -163,10 +163,10 @@
 static void
 startup_error_handler(enum log_type type, const char *fmt, va_list args)
 {
-	fputs("Error: ", stderr);
-	vfprintf(stderr, fmt, args);
-	fputc('\n', stderr);
+	va_list args2;
 
+	VA_COPY(args2, args);
+	fprintf(stderr, "Error: %s\n", t_strdup_vprintf(fmt, args2));
 	orig_error_callback(type, fmt, args);
 }