1 files changed, 3 insertions, 1 deletions
diff --git a/tty.c b/tty.c
index 233d52a8..a9678eaf 100644
--- a/tty.c
+++ b/tty.c
@@ -937,7 +937,9 @@ tty_update_window_offset(struct window *w)
 	struct client	*c;
 
 	TAILQ_FOREACH(c, &clients, entry) {
-		if (c->session != NULL && c->session->curw->window == w)
+		if (c->session != NULL &&
+		    c->session->curw != NULL &&
+		    c->session->curw->window == w)
 			tty_update_client_offset(c);
 	}
 }