diff --git a/pkg/tsdb/models/proxy/wrapper.go b/pkg/tsdb/models/proxy/wrapper.go
index 06ee63f8fd2..899b65a1478 100644
--- a/pkg/tsdb/models/proxy/wrapper.go
+++ b/pkg/tsdb/models/proxy/wrapper.go
@@ -14,8 +14,15 @@ type TsdbWrapper struct {
 }
 
 func (tw *TsdbWrapper) Query(ctx context.Context, ds *models.DataSource, query *tsdb.TsdbQuery) (*tsdb.Response, error) {
-	jsonData, _ := ds.JsonData.MarshalJSON()
-	now, _ := ptypes.TimestampProto(query.TimeRange.Now)
+	jsonData, err := ds.JsonData.MarshalJSON()
+	if err != nil {
+		return nil, err
+	}
+
+	now, err := ptypes.TimestampProto(query.TimeRange.Now)
+	if err != nil {
+		return nil, err
+	}
 
 	pbQuery := &proto.TsdbQuery{
 		Datasource: &proto.DatasourceInfo{