diff --git a/model/commit_message.go b/model/commit_message.go
index 515949b..6cc3eb7 100644
--- a/model/commit_message.go
+++ b/model/commit_message.go
@@ -39,9 +39,9 @@ func (c *CommitMessage) GetScope() string {
 
 // GetMessage will return formatted commit message
 func (c *CommitMessage) GetMessage() string {
-	scope := ""
-	if c.Scope != "" {
-		scope = "(" + c.GetScope() + ")"
+	scope := c.GetScope()
+	if scope != "" {
+		scope = "(" + scope + ")"
 	}
 
 	// Add message to commit message
diff --git a/util/question.go b/util/question.go
index 52adc11..df62b10 100644
--- a/util/question.go
+++ b/util/question.go
@@ -48,7 +48,7 @@ func GenerateQuestionViaTypeConfig(title string, config *model.TypeConfig, listC
 		options := list.MakeList()
 
 		if !config.Require() {
-			header := model.Header{Type: "", Value: "Empty"}
+			header := model.Header{Type: "", Value: "go to next question"}
 			options = append(options, header.Format())
 		}