===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- src/usr.bin/tmux/window.c	2014/12/15 10:04:18	1.115
+++ src/usr.bin/tmux/window.c	2015/02/09 12:47:18	1.116
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.115 2014/12/15 10:04:18 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.116 2015/02/09 12:47:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -263,7 +263,7 @@
 
 	for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
 		w = ARRAY_ITEM(&windows, i);
-		if (w->id == id)
+		if (w != NULL && w->id == id)
 			return (w);
 	}
 	return (NULL);