client.go | 3 ++-
 daemon.go | 2 +-

diff --git a/client.go b/client.go
index 5bd779dd474e0684eaef620509e0f288168d22201e80d42b8672db8c0cec1e74..a735cce91b370363b51701079970dfde3b197f30c93deb97b3553197cfc10f02 100644
--- a/client.go
+++ b/client.go
@@ -301,10 +301,11 @@ 		client.ReplyNoNickChan(nickname)
 		continue
 	Found:
 		var host string
+		var err error
 		if *cloak != "" {
 			host = *cloak
 		} else {
-			host, _, err := net.SplitHostPort(c.conn.RemoteAddr().String())
+			host, _, err = net.SplitHostPort(c.conn.RemoteAddr().String())
 			if err != nil {
 				log.Printf("can't parse RemoteAddr %q: %v", host, err)
 				host = "Unknown"
diff --git a/daemon.go b/daemon.go
index ddd2ca10a2051653dcba44900ddb21494de167a501bf95d540e13e4ba2aa1ce2..d98ef502b9a9d5f79cb04b43e9c2b8e0f0a9cf2a83cb8aa6c7fad58008506a14 100644
--- a/daemon.go
+++ b/daemon.go
@@ -273,7 +273,7 @@ 				if len(cols) == 1 || len(cols[1]) < 1 {
 					client.ReplyNotEnoughParameters("WHOIS")
 					continue
 				}
-				cols := strings.Split(cols[1], " ")
+				cols = strings.Split(cols[1], " ")
 				nicknames := strings.Split(cols[len(cols)-1], ",")
 				client.SendWhois(nicknames)
 			case "ISON":