try:
                 to_yield = self._q_keypresses.get(timeout=0.1)
             except QueueEmpty:
-                break
+                yield None
             yield TuiEvent.affector('handle_keyboard_event'
                                     ).kw(typed_in=to_yield)
 
             try:
                 msg = self._q_server_msgs.get(timeout=0.1)
             except QueueEmpty:
-                break
+                yield None
             yield self._make_recv_event(IrcMessage.from_raw(msg))
 
 
         while True:
             self._playbook_idx += 1
             line = self._playbook[self._playbook_idx]
-            if not line.strip():
+            if line[:1] == '#' or not line.strip():
                 continue
             context, msg = line.split(' ', maxsplit=1)
-            if context == '#':
-                continue
             if context == '>':
                 for c in msg:
                     self._q_keypresses.put(c)