diff --git a/addrmanager.go b/addrmanager.go
index 17685e04..3a90fa4c 100644
--- a/addrmanager.go
+++ b/addrmanager.go
@@ -557,7 +557,6 @@ func (a *AddrManager) GetAddress(class string, newBias int) *knownAddress {
 			factor *= 1.2
 		}
 	}
-	return nil
 }
 
 func (a *AddrManager) find(addr *btcwire.NetAddress) *knownAddress {
diff --git a/peer.go b/peer.go
index d48328a7..6ad23568 100644
--- a/peer.go
+++ b/peer.go
@@ -1162,7 +1162,11 @@ func newOutboundPeer(s *server, addr string, persistent bool) *peer {
 		dial := net.Dial
 		faddr := addr
 		if cfg.Proxy != "" {
-			proxy := &socks.Proxy{cfg.Proxy, cfg.ProxyUser, cfg.ProxyPass}
+			proxy := &socks.Proxy{
+				Addr:     cfg.Proxy,
+				Username: cfg.ProxyUser,
+				Password: cfg.ProxyPass,
+			}
 			dial = proxy.Dial
 			faddr = fmt.Sprintf("%s via proxy %s", addr, cfg.Proxy)
 		}