diff --git a/lib/socks/client/handle.go b/lib/socks/client/handle.go
index e504c52..c4b3e23 100644
--- a/lib/socks/client/handle.go
+++ b/lib/socks/client/handle.go
@@ -12,8 +12,10 @@ import (
 	"github.com/txthinking/socks5"
 )
 
-var socksHandler socks5.Handler = &SOCKS{}
-var forwardConfig = config.DefaultConfig()
+var (
+	socksHandler  socks5.Handler = &SOCKS{}
+	forwardConfig                = config.DefaultConfig()
+)
 
 // TCPHandle implements socks5.Handler.
 func (s *SOCKS) TCPHandle(_ *socks5.Server, conn *net.TCPConn, req *socks5.Request) error {
diff --git a/lib/socks/client/socks.go b/lib/socks/client/socks.go
index 623561c..638a4f8 100644
--- a/lib/socks/client/socks.go
+++ b/lib/socks/client/socks.go
@@ -131,9 +131,8 @@ func (s *SOCKS) Start() error {
 	s.I2PTunnelStatus = i2ptunnel.I2PTunnelStatusStarting
 	s.Server.Handle = s
 	s.I2PTunnelStatus = i2ptunnel.I2PTunnelStatusRunning
-	s.Server.ListenAndServe(s)
 
-	return nil
+	return s.Server.ListenAndServe(s)
 }
 
 // Get the tunnel's status