2 files changed, 3 insertions, 1 deletions
diff --git a/names.c b/names.c
index f437b53e..09b33082 100644
--- a/names.c
+++ b/names.c
@@ -109,6 +109,8 @@ default_window_name(struct window *w)
 {
 	char	*cmd, *s;
 
+	if (w->active == NULL)
+		return (xstrdup(""));
 	cmd = cmd_stringify_argv(w->active->argc, w->active->argv);
 	if (cmd != NULL && *cmd != '\0')
 		s = parse_window_name(cmd);
diff --git a/spawn.c b/spawn.c
index 9a801a38..e3f8debe 100644
--- a/spawn.c
+++ b/spawn.c
@@ -184,7 +184,7 @@ spawn_window(struct spawn_context *sc, char **cause)
 			    NULL);
 			options_set_number(w->options, "automatic-rename", 0);
 		} else
-			w->name = xstrdup(default_window_name(w));
+			w->name = default_window_name(w);
 	}
 
 	/* Switch to the new window if required. */