diff --git a/cmd/promxy/main.go b/cmd/promxy/main.go
index 5c9e1dd67..d7cab4774 100644
--- a/cmd/promxy/main.go
+++ b/cmd/promxy/main.go
@@ -225,7 +225,7 @@ func main() {
 		Format: &promlog.AllowedFormat{},
 	}
 	if err := logCfg.Level.Set("info"); err != nil {
-		panic(err)
+		logrus.Fatalf("Unable to set log level: %v", err)
 	}
 
 	logger := promlog.New(logCfg)
diff --git a/pkg/proxystorage/proxy.go b/pkg/proxystorage/proxy.go
index 801925038..be18eb9c4 100644
--- a/pkg/proxystorage/proxy.go
+++ b/pkg/proxystorage/proxy.go
@@ -176,7 +176,7 @@ func (p *ProxyStorage) Appender(context.Context) storage.Appender {
 func (p *ProxyStorage) Close() error { return nil }
 
 func (p *ProxyStorage) ChunkQuerier(ctx context.Context, mint, maxt int64) (storage.ChunkQuerier, error) {
-	panic("not implemented") // TODO
+	return nil, errors.New("not implemented")
 }
 
 // NodeReplacer replaces promql Nodes with more efficient-to-fetch ones. This works by taking lower-layer