diff --git a/internal/convention/commit_test.go b/internal/convention/commit_test.go
index 2cf474a..b08d241 100644
--- a/internal/convention/commit_test.go
+++ b/internal/convention/commit_test.go
@@ -60,6 +60,10 @@ func TestNewCommit(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:    "Empty commit",
+			wantErr: ErrEmptyCommit,
+		},
 	}
 
 	for _, tc := range tests {
diff --git a/internal/convention/option.go b/internal/convention/option.go
index 50d82e8..801b10c 100644
--- a/internal/convention/option.go
+++ b/internal/convention/option.go
@@ -20,12 +20,13 @@ type OptionFn func(*Commit) error
 
 func GetRawHeader(gitCommit git.Commit) OptionFn {
 	return func(c *Commit) error {
-		message := strings.TrimSpace(gitCommit.Message)
-		messages := strings.Split(message, "\n")
-		if len(messages) == 0 {
+		if gitCommit.Message == "" {
 			return ErrEmptyCommit
 		}
 
+		message := strings.TrimSpace(gitCommit.Message)
+		messages := strings.Split(message, "\n")
+
 		c.RawHeader = messages[0]
 
 		return nil