diff --git a/tmate-decoder.c b/tmate-decoder.c
index ed9d5dd5..1f8a4d6d 100644
--- a/tmate-decoder.c
+++ b/tmate-decoder.c
@@ -410,6 +410,10 @@ static void tmate_write_copy_mode(struct tmate_unpacker *uk)
 		tmate_fatal("can't find pane id=%d", id);
 
 	str = unpack_string(uk);
+
+	if (window_pane_set_mode(wp, &window_copy_mode) == 0)
+		window_copy_init_for_output(wp);
+
 	window_copy_add(wp, "%s", str);
 	free(str);
 }
diff --git a/tmate-ssh-server.c b/tmate-ssh-server.c
index 50f58326..701ea9b1 100644
--- a/tmate-ssh-server.c
+++ b/tmate-ssh-server.c
@@ -199,8 +199,9 @@ static void handle_sigalrm(void)
 
 static void handle_sigsegv(void)
 {
-	tmate_fatal("CRASH");
+	tmate_info("CRASH, printing stack trace");
 	tmate_print_trace();
+	tmate_fatal("CRASHED");
 }
 
 static void handle_sigusr1(void)