diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index db2cf64dd5..516f63d3e0 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -794,8 +794,8 @@ log:
         core_message = strjoin("MESSAGE=Process ", context[CONTEXT_PID],
                                " (", context[CONTEXT_COMM], ") of user ",
                                context[CONTEXT_UID], " dumped core.",
-                               journald_crash ? "\nCoredump diverted to " : NULL,
-                               journald_crash ? filename : NULL);
+                               journald_crash && filename ? "\nCoredump diverted to " : NULL,
+                               journald_crash && filename ? filename : NULL);
         if (!core_message)
                 return log_oom();