diff --git a/.travis.yml b/.travis.yml
index 1b58030..06ec86c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,7 @@ before_install:
 - sudo $TRAVIS_BUILD_DIR/.travis/prepare.sh "$FTP_SERVER"
 - sudo sysctl net.ipv6.conf.lo.disable_ipv6=0
 - go get github.com/mattn/goveralls
+- go get github.com/golang/lint/golint
 script:
 - goveralls -v
+- golint -set_exit_status $(go list ./...)
diff --git a/ftp.go b/ftp.go
index d4ed100..8cd330b 100644
--- a/ftp.go
+++ b/ftp.go
@@ -131,11 +131,9 @@ func (c *ServerConn) Login(user, password string) error {
 	}
 
 	// Switch to UTF-8
-	if err := c.setUTF8(); err != nil {
-		return err
-	}
+	err = c.setUTF8()
 
-	return nil
+	return err
 }
 
 // feat issues a FEAT FTP command to list the additional commands supported by