diff --git a/popup.c b/popup.c
index be981a39..138085a0 100644
--- a/popup.c
+++ b/popup.c
@@ -349,6 +349,8 @@ popup_make_pane(struct popup_data *pd, enum layout_type type)
 	window_unzoom(w, 1);
 
 	lc = layout_split_pane(wp, type, -1, 0);
+	if (lc == NULL)
+		return;
 	hlimit = options_get_number(s->options, "history-limit");
 	new_wp = window_add_pane(wp->window, NULL, hlimit, 0);
 	layout_assign_pane(lc, new_wp, 0);
diff --git a/server.c b/server.c
index c941b25a..b50bb0b6 100644
--- a/server.c
+++ b/server.c
@@ -72,7 +72,8 @@ server_set_marked(struct session *s, struct winlink *wl, struct window_pane *wp)
 	cmd_find_clear_state(&marked_pane, 0);
 	marked_pane.s = s;
 	marked_pane.wl = wl;
-	marked_pane.w = wl->window;
+	if (wl != NULL)
+		marked_pane.w = wl->window;
 	marked_pane.wp = wp;
 }