diff --git a/main.go b/main.go
index 02675b4..2c15115 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"html/template"
 	"io"
 	golog "log"
@@ -95,24 +94,25 @@ func main() {
 	sqlDB.SetMaxOpenConns(1)
 
 	// Migrate the schema
-	db.AutoMigrate(&originals.Original{}, &playlists.Playlist{},
+	if err := db.AutoMigrate(&originals.Original{}, &playlists.Playlist{},
 		&media.Video{}, &media.Audio{}, &media.VideoClip{},
-		&users.User{}, &TempURL{}, &transcodes.Transcode{})
+		&users.User{}, &TempURL{}, &transcodes.Transcode{}); err != nil {
+		log.Fatal(err)
+	}
 
 	database.Init(db, log)
 	defer database.Fini()
 	err = handlers.Init(log)
 	if err != nil {
-		panic(fmt.Sprintf("%v", err))
+		log.Fatal(err)
 	}
 	defer handlers.Fini()
 
 	go PeriodicCleanup()
 
 	// create a user
-	err = ensureAdminAccount(db)
-	if err != nil {
-		panic(fmt.Sprintf("failed to create admin user: %v", err))
+	if err = ensureAdminAccount(db); err != nil {
+		log.Fatal("create admin account error:", err)
 	}
 
 	// Initialize Echo