diff --git a/cmd/collector/app/builder/span_handler_builder_test.go b/cmd/collector/app/builder/span_handler_builder_test.go
index bc41e6cf89f..c1cdaeef51a 100644
--- a/cmd/collector/app/builder/span_handler_builder_test.go
+++ b/cmd/collector/app/builder/span_handler_builder_test.go
@@ -44,9 +44,10 @@ func TestNewSpanHandlerBuilder(t *testing.T) {
 	)
 	require.NoError(t, err)
 	assert.NotNil(t, handler)
-	zipkin, jaeger := handler.BuildHandlers()
+	zipkin, jaeger, grpc := handler.BuildHandlers()
 	assert.NotNil(t, zipkin)
 	assert.NotNil(t, jaeger)
+	assert.NotNil(t, grpc)
 }
 
 func TestDefaultSpanFilter(t *testing.T) {
diff --git a/cmd/collector/app/grpc_handler.go b/cmd/collector/app/grpc_handler.go
index eb6310cc65d..3abdc17bf96 100644
--- a/cmd/collector/app/grpc_handler.go
+++ b/cmd/collector/app/grpc_handler.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2018 The Jaeger Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package app
 
 import (
@@ -5,9 +19,10 @@ import (
 	"fmt"
 	"time"
 
+	"go.uber.org/zap"
+
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
-	"go.uber.org/zap"
 )
 
 // GRPCHandler implements gRPC CollectorService.
@@ -39,7 +54,7 @@ func (g *GRPCHandler) GetTrace(ctx context.Context, req *api_v2.GetTraceRequest)
 	return &api_v2.GetTraceResponse{
 		Trace: &model.Trace{
 			Spans: []*model.Span{
-				&model.Span{
+				{
 					TraceID:       model.TraceID{Low: 123},
 					SpanID:        model.NewSpanID(456),
 					OperationName: "foo bar",