diff --git a/cmd/budgeteer/main.go b/cmd/budgeteer/main.go
index 1fc5780..7134a42 100644
--- a/cmd/budgeteer/main.go
+++ b/cmd/budgeteer/main.go
@@ -1,6 +1,8 @@
 package main
 
 import (
+	"log"
+
 	"git.javil.eu/jacob1123/budgeteer/bcrypt"
 	"git.javil.eu/jacob1123/budgeteer/config"
 	"git.javil.eu/jacob1123/budgeteer/http"
@@ -11,19 +13,19 @@ import (
 func main() {
 	cfg, err := config.LoadConfig()
 	if err != nil {
-		panic("Could not load Config")
+		log.Fatalf("Could not load Config: %v", err)
 	}
 
 	bv := &bcrypt.Verifier{}
 
 	db, err := postgres.Connect(cfg.DatabaseHost, cfg.DatabaseUser, cfg.DatabasePassword, cfg.DatabaseName)
 	if err != nil {
-		panic("Failed connecting to DB")
+		log.Fatalf("Failed connecting to DB: %v", err)
 	}
 
 	us, err := postgres.NewRepository(db)
 	if err != nil {
-		panic("Failed building Repository")
+		log.Fatalf("Failed building Repository: %v", err)
 	}
 
 	tv := &jwt.TokenVerifier{}