diff --git a/balancer/grpclb/grpclb.go b/balancer/grpclb/grpclb.go
index e0575c3cd..1bdf560e8 100644
--- a/balancer/grpclb/grpclb.go
+++ b/balancer/grpclb/grpclb.go
@@ -16,7 +16,11 @@
  *
  */
 
-package grpclb // import "google.golang.org/grpc/balancer/grpclb"
+// Package grpclb defines a grpclb balancer.
+//
+// To install grpclb balancer, import this package as:
+//    import _ "google.golang.org/grpc/balancer/grpclb"
+package grpclb
 
 import (
 	"strconv"
diff --git a/balancer/grpclb/grpclb_test.go b/balancer/grpclb/grpclb_test.go
index 9f0fc3828..18ef82705 100644
--- a/balancer/grpclb/grpclb_test.go
+++ b/balancer/grpclb/grpclb_test.go
@@ -340,10 +340,6 @@ func newLoadBalancer(numberOfBackends int) (tss *testServers, cleanup func(), er
 		sn: lbServerName,
 	}
 	lb = grpc.NewServer(grpc.Creds(lbCreds))
-	if err != nil {
-		err = fmt.Errorf("Failed to generate the port number %v", err)
-		return
-	}
 	ls = newRemoteBalancer(nil)
 	lbspb.RegisterLoadBalancerServer(lb, ls)
 	go func() {
diff --git a/grpclb/noimport.go b/grpclb/noimport.go
index 7bd18b367..b1b24298d 100644
--- a/grpclb/noimport.go
+++ b/grpclb/noimport.go
@@ -23,5 +23,5 @@
 package grpclb
 
 func init() {
-	panic("don't import me")
+	panic("Don't import this package. For grpclb, see package google.golang.org/grpc/balancer/grpclb")
 }