===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-option.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -c -r1.101 -r1.102
*** src/usr.bin/tmux/cmd-set-option.c	2016/10/16 19:04:05	1.101
--- src/usr.bin/tmux/cmd-set-option.c	2016/11/04 18:56:25	1.102
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-option.c,v 1.101 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-set-option.c,v 1.102 2016/11/04 18:56:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 187,192 ****
--- 187,194 ----
  	/* Start or stop timers if necessary. */
  	if (strcmp(oe->name, "automatic-rename") == 0) {
  		RB_FOREACH(w, windows, &windows) {
+ 			if (w->active == NULL)
+ 				continue;
  			if (options_get_number(w->options, "automatic-rename"))
  				w->active->flags |= PANE_CHANGED;
  		}