diff --git a/chat/message/user.go b/chat/message/user.go
index cdb0b29..4140894 100644
--- a/chat/message/user.go
+++ b/chat/message/user.go
@@ -143,7 +143,9 @@ func (u *User) setColorIdx(idx int) {
 func (u *User) Close() {
 	u.closeOnce.Do(func() {
 		if u.screen != nil {
-			u.screen.Close()
+			if err := u.screen.Close(); err != nil {
+				logger.Printf("Failed to close user %q screen: %s", u.ID(), err)
+			}
 		}
 		// close(u.msg) TODO: Close?
 		close(u.done)
diff --git a/sshd/terminal.go b/sshd/terminal.go
index e8d9901..8d85837 100644
--- a/sshd/terminal.go
+++ b/sshd/terminal.go
@@ -167,7 +167,9 @@ func (t *Terminal) Close() error {
 	var err error
 	t.closeOnce.Do(func() {
 		close(t.done)
-		t.Channel.Close()
+		if err := t.Channel.Close(); err != nil {
+			logger.Printf("[%s] Failed to close terminal channel: %s", t.Conn.RemoteAddr(), err)
+		}
 		err = t.Conn.Close()
 	})
 	return err