diff --git a/Gopkg.lock b/Gopkg.lock
index c029adf7ee98..5b4b2775e387 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1825,6 +1825,8 @@
     "github.com/cortexproject/cortex/pkg/ingester/client",
     "github.com/cortexproject/cortex/pkg/ingester/index",
     "github.com/cortexproject/cortex/pkg/ring",
+    "github.com/cortexproject/cortex/pkg/ring/kv",
+    "github.com/cortexproject/cortex/pkg/ring/kv/codec",
     "github.com/cortexproject/cortex/pkg/util",
     "github.com/cortexproject/cortex/pkg/util/flagext",
     "github.com/cortexproject/cortex/pkg/util/grpcclient",
diff --git a/cmd/loki/main.go b/cmd/loki/main.go
index a8b4a07bbebf..abea6d2751af 100644
--- a/cmd/loki/main.go
+++ b/cmd/loki/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"reflect"
 
@@ -28,7 +27,8 @@ func main() {
 
 	var config loki.Config
 	if err := cfg.Parse(&config); err != nil {
-		log.Fatalln(err)
+		level.Error(util.Logger).Log("msg", "parsing config", "error", err)
+		os.Exit(1)
 	}
 	if *printVersion {
 		fmt.Print(version.Print("loki"))
@@ -39,7 +39,8 @@ func main() {
 	// call it atleast once, the defaults are set to an empty struct.
 	// We call it with the flag values so that the config file unmarshalling only overrides the values set in the config.
 	if _, err := validation.NewOverrides(config.LimitsConfig); err != nil {
-		log.Fatalln(err)
+		level.Error(util.Logger).Log("msg", "setting up overrides", "error", err)
+		os.Exit(1)
 	}
 
 	// Init the logger which will honor the log level set in config.Server
diff --git a/cmd/promtail/main.go b/cmd/promtail/main.go
index 51ef9b4b2cf6..bda02a679dea 100644
--- a/cmd/promtail/main.go
+++ b/cmd/promtail/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"reflect"
 
@@ -28,7 +27,8 @@ func main() {
 
 	var config config.Config
 	if err := cfg.Parse(&config); err != nil {
-		log.Fatalln(err)
+		level.Error(util.Logger).Log("msg", "parsing config", "error", err)
+		os.Exit(1)
 	}
 	if *printVersion {
 		fmt.Print(version.Print("promtail"))