diff --git a/main.go b/main.go
index a8de8aecda4bb92420571b9fba893076e9f11128..81bf9b54777e1457eef6952c97ba2b36fe33efd7 100644
--- a/main.go
+++ b/main.go
@@ -27,7 +27,9 @@ func (m *model) init() {
 	m.parseConfig(&*flagConfig)
 	log.Println("Listening on", m.Listen)
 	if m.AccessToken == "CHANGEME" {
-		log.Fatalln("Access token *must* be defined, either by flag or config file.")
+		log.Fatalln("Access token *must* be changed.")
+	} else if m.AccessToken == "" {
+		log.Fatalln("Access token *must* be defined.")
 	}
 	log.Println("Reading database at", m.DatabasePath+"/")
 }