diff --git a/gtests/net/packetdrill/logging.c b/gtests/net/packetdrill/logging.c
index 0b722845d6fdcc219006e3a666dc538cb7ab374a..85a12e9e831fbe426cad7ccd049ea829b4f4a579 100644
--- a/gtests/net/packetdrill/logging.c
+++ b/gtests/net/packetdrill/logging.c
@@ -52,8 +52,10 @@ void __attribute__((noreturn)) die_perror(char *message)
 
 void __attribute__((noreturn)) die_strerror(char *message, int err)
 {
-	fprintf(stderr, "%s: %s", message, strerror(err));
-
+	if ((message != NULL) && (strlen(message) > 0))
+		fprintf(stderr, "%s: %s\n", message, strerror(err));
+	else
+		fprintf(stderr, "%s\n", strerror(err));
 	run_cleanup_command();
 
 	exit(EXIT_FAILURE);