diff --git a/server/main.go b/server/main.go
index c05c2e6b484d85d46d38ec2b392025e18eeeaaf5..3d399e4c4e7aa8a90e49d4f5e55740057ee46134 100644
--- a/server/main.go
+++ b/server/main.go
@@ -209,7 +209,8 @@ type server struct{}
 // This method is used to execute the query and return the response to the
 // client as a protocol buffer message.
 func (s *server) Query(ctx context.Context,
-	req *graph.Request) (resp *graph.Response, err error) {
+	req *graph.Request) (*graph.Response, error) {
+	resp := new(graph.Response)
 	if len(req.Query) == 0 {
 		glog.Error("While reading query")
 		return resp, fmt.Errorf("Empty query")