diff --git a/sshpiperd/upstream/database/handler_test.go b/sshpiperd/upstream/database/handler_test.go
index 577ccd8b..72a2117d 100644
--- a/sshpiperd/upstream/database/handler_test.go
+++ b/sshpiperd/upstream/database/handler_test.go
@@ -125,6 +125,9 @@ func TestFindUpstream(t *testing.T) {
 	h := p.GetHandler()
 
 	listener, err := createListener(t)
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer listener.Close()
 
 	createEntry(t, db, "finddown0", "findup0", listener.Addr().String(), false)
@@ -164,6 +167,9 @@ func TestPublicKeyCallback(t *testing.T) {
 	h := p.GetHandler()
 
 	listener, err := createListener(t)
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer listener.Close()
 
 	pub, _ := createEntry(t, db, "pkdown", "pkdown", listener.Addr().String(), false)
diff --git a/sshpiperd/upstream/database/mssql.go b/sshpiperd/upstream/database/mssql.go
index 3af5292c..3e0c2860 100644
--- a/sshpiperd/upstream/database/mssql.go
+++ b/sshpiperd/upstream/database/mssql.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 
 	"github.com/jinzhu/gorm"
-	_ "github.com/jinzhu/gorm/dialects/mssql"
+	_ "github.com/jinzhu/gorm/dialects/mssql" // gorm dialect
 
 	upstreamprovider "github.com/tg123/sshpiper/sshpiperd/upstream"
 )
diff --git a/sshpiperd/upstream/workingdir/pipemgr.go b/sshpiperd/upstream/workingdir/pipemgr.go
index e3c3f795..2ef7cb8f 100644
--- a/sshpiperd/upstream/workingdir/pipemgr.go
+++ b/sshpiperd/upstream/workingdir/pipemgr.go
@@ -26,6 +26,9 @@ func (p *plugin) ListPipe() ([]upstream.Pipe, error) {
 		}
 
 		host, port, mappedUser, err := parseUpstreamFile(string(data))
+		if err != nil {
+			continue
+		}
 
 		pipes = append(pipes, upstream.Pipe{
 			Host:             host,
diff --git a/sshpiperd/upstream/workingdir/workingdir.go b/sshpiperd/upstream/workingdir/workingdir.go
index 52850ad3..a3e43045 100644
--- a/sshpiperd/upstream/workingdir/workingdir.go
+++ b/sshpiperd/upstream/workingdir/workingdir.go
@@ -122,7 +122,6 @@ func findUpstreamFromUserfile(conn ssh.ConnMetadata, challengeContext ssh.Additi
 	err := userUpstreamFile.checkPerm(user)
 
 	if os.IsNotExist(err) && len(config.FallbackUsername) > 0 {
-		err = nil
 		user = config.FallbackUsername
 	} else if err != nil {
 		return nil, nil, err