diff --git a/cmd/occollector/app/sender/jaeger_proto_grpc_sender.go b/cmd/occollector/app/sender/jaeger_proto_grpc_sender.go
index c4d22370..96ff6d46 100644
--- a/cmd/occollector/app/sender/jaeger_proto_grpc_sender.go
+++ b/cmd/occollector/app/sender/jaeger_proto_grpc_sender.go
@@ -40,7 +40,9 @@ var _ consumer.TraceConsumer = (*JaegerThriftHTTPSender)(nil)
 // The collector endpoint should be of the form "hostname:14250".
 func NewJaegerProtoGRPCSender(collectorEndpoint string, zlogger *zap.Logger) *JaegerProtoGRPCSender {
 	client, err := grpc.Dial(collectorEndpoint, grpc.WithInsecure())
-	zlogger.Fatal("Failed to dail grpc connection", zap.Error(err))
+	if err != nil {
+		zlogger.Fatal("Failed to dail grpc connection", zap.Error(err))
+	}
 	collectorServiceClient := jaegerproto.NewCollectorServiceClient(client)
 	s := &JaegerProtoGRPCSender{
 		client: collectorServiceClient,
diff --git a/go.mod b/go.mod
index 1cdd906c..e05e0011 100644
--- a/go.mod
+++ b/go.mod
@@ -59,3 +59,5 @@ require (
 	gopkg.in/DataDog/dd-trace-go.v1 v1.12.1 // indirect
 	gopkg.in/yaml.v2 v2.2.2
 )
+
+replace git.apache.org/thrift.git => github.com/apache/thrift v0.12.0
diff --git a/go.sum b/go.sum
index a58fec56..5a267b7a 100644
--- a/go.sum
+++ b/go.sum
@@ -51,6 +51,7 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7 h1:Fv9bK1Q+ly/ROk4aJsVMeuIwPel4bEnD8EPiI91nZMg=
 github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/aws/aws-sdk-go v0.0.0-20180507225419-00862f899353/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k=