1 files changed, 10 insertions, 2 deletions
diff --git a/irc/states.go b/irc/states.go
index dcfff1f..3f787b7 100644
--- a/irc/states.go
+++ b/irc/states.go
@@ -501,9 +501,17 @@ func (s *Session) run() {
 			if !ok {
 				break
 			}
+			u, ok := s.users[t.Name]
+			if !ok {
+				break
+			}
+			c, ok := s.channels[t.Target]
+			if !ok {
+				break
+			}
 			s.evts <- TagEvent{
-				User:   s.users[t.Name].Name,
-				Target: s.channels[t.Target].Name,
+				User:   u.Name,
+				Target: c.Name,
 				Typing: TypingDone,
 				Time:   time.Now(),
 			}