diff --git a/cmd/scanner/main.go b/cmd/scanner/main.go
index fb9f76b..cfa0b65 100644
--- a/cmd/scanner/main.go
+++ b/cmd/scanner/main.go
@@ -42,6 +42,10 @@ func main() {
 		db,
 		*musicPath,
 	)
-	s.MigrateDB()
-	s.Start()
+	if err := s.MigrateDB(); err != nil {
+		log.Fatalf("error migrating: %v\n", err)
+	}
+	if err := s.Start(); err != nil {
+		log.Fatalf("error starting scanner: %v\n", err)
+	}
 }
diff --git a/cmd/server/main.go b/cmd/server/main.go
index ee5c99d..ce85ee4 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -53,8 +53,7 @@ func main() {
 		*listenAddr,
 	)
 	log.Printf("starting server at %s", *listenAddr)
-	err = s.ListenAndServe()
-	if err != nil {
+	if err := s.ListenAndServe(); err != nil {
 		log.Fatalf("error starting server: %v\n", err)
 	}
 }
diff --git a/server/handler/handler_admin_utils_test.go b/server/handler/handler_admin_utils_test.go
index 1ad27aa..f4dd0de 100644
--- a/server/handler/handler_admin_utils_test.go
+++ b/server/handler/handler_admin_utils_test.go
@@ -25,9 +25,7 @@ func TestFirstExisting(t *testing.T) {
 			"default"},
 	}
 	for _, tc := range cases {
-		tc := tc // capture range variable?
 		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
 			actu := firstExisting(tc.or, tc.values...)
 			if actu != tc.exp {
 				t.Errorf("expected %q, got %q", tc.exp, actu)