diff --git a/goatherd.go b/goatherd.go
index a46c6c2f344728cb510d8f20fe2b571353151187..472157c19ad25704cdc258d6339d16178c7092dc 100644
--- a/goatherd.go
+++ b/goatherd.go
@@ -461,7 +461,10 @@ func listen(wg *sync.WaitGroup, listener net.Listener) {
 
 			delay := handleConn(remote, reader, writer)
 			debugf("[%v] closing", remote)
-			conn.Close() // XXX: check err?
+			err = conn.Close()
+			if err != nil {
+				log.Printf("[%v] Close(): %v", remote, err)
+			}
 
 			if delay != nil {
 				debugf("[%v] delaying for %v", remote, cfg.Faildelay.Duration)