diff --git a/bridge/irc/handlers.go b/bridge/irc/handlers.go
index da617ebc..0f96c2bc 100644
--- a/bridge/irc/handlers.go
+++ b/bridge/irc/handlers.go
@@ -81,7 +81,9 @@ func (b *Birc) handleInvite(client *girc.Client, event girc.Event) {
 }
 
 func isKill(quitmsg string) bool {
-	return strings.HasPrefix(quitmsg, "Killed") || strings.HasPrefix(quitmsg, "Local kill") || strings.HasPrefix(quitmsg[1:], "-lined")
+	return (strings.HasPrefix(quitmsg, "Killed") ||
+		strings.HasPrefix(quitmsg, "Local kill") ||
+		(len(quitmsg) > 7 && strings.HasPrefix(quitmsg[1:], "-lined")))
 }
 
 func (b *Birc) handleJoinPart(client *girc.Client, event girc.Event) {