diff --git a/infra/conf/geodata/geodata.go b/infra/conf/geodata/geodata.go
index 1abcb37ac..6bac46898 100644
--- a/infra/conf/geodata/geodata.go
+++ b/infra/conf/geodata/geodata.go
@@ -75,9 +75,9 @@ func getGeoDataLoaderImplementation(name string) (LoaderImplementation, error) {
 }
 
 func GetGeoDataLoader(name string) (Loader, error) {
-	if loadImpl, err := getGeoDataLoaderImplementation(name); err == nil {
+	loadImpl, err := getGeoDataLoaderImplementation(name)
+	if err == nil {
 		return &loader{loadImpl}, nil
-	} else { // nolint:golint
-		return nil, err
 	}
+	return nil, err
 }
diff --git a/infra/conf/geodata/standard/standard.go b/infra/conf/geodata/standard/standard.go
index 056a74d05..42e5894b6 100644
--- a/infra/conf/geodata/standard/standard.go
+++ b/infra/conf/geodata/standard/standard.go
@@ -3,7 +3,7 @@ package standard
 import (
 	"strings"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/v2fly/v2ray-core/v4/app/router"
 	"github.com/v2fly/v2ray-core/v4/common/platform/filesystem"