diff --git a/arsenic.py b/arsenic.py
index 55ef026..2a5d89c 100755
--- a/arsenic.py
+++ b/arsenic.py
@@ -160,7 +160,7 @@ if __name__ == '__main__':
     l1 = Arsenic(('irc.lanl.gov', 6667),
                  NICK,
                  INFO,
-                 ["#x"],
+                 ["#x", "#csirt"],
                  ssl=False)
     l1.debug = debug
 
diff --git a/irc.py b/irc.py
index e0eac99..f70b3d0 100644
--- a/irc.py
+++ b/irc.py
@@ -472,11 +472,12 @@ class Bot(SmartIRCHandler):
 
             # Despool a line
             target, lines = which
-            line = lines[0]
-            target.msg(line)
-            del lines[0]
-            if not lines:
-                self._spool.remove((target, lines))
+            if lines:
+                line = lines[0]
+                target.msg(line)
+                del lines[0]
+            else:
+                self._spool.remove(which)
 
     def announce(self, text):
         for c in self.channels: