--- source/names.c.orig	Mon Jul 17 18:03:05 2000
+++ source/names.c	Mon Jul 17 18:03:15 2000
@@ -273,7 +273,8 @@
 	if (chan->next)
 		chan->next->prev = chan->prev;
 
-	channel_going_away(chan->window, chan->channel);
+	if (chan->window)
+		channel_going_away(chan->window, chan->channel);
 
 	/*
 	 * If this was the last channel on that window, be more forceful