diff --git a/src/Gitonomy/Git/Parser/LogParser.php b/src/Gitonomy/Git/Parser/LogParser.php
index 2672186..4397a46 100644
--- a/src/Gitonomy/Git/Parser/LogParser.php
+++ b/src/Gitonomy/Git/Parser/LogParser.php
@@ -49,7 +49,9 @@ protected function doParse()
             $this->consumeGPGSignature();
 
             $this->consumeNewLine();
-            $this->consumeNewLine();
+            if ($this->cursor < strlen($this->content)) {
+                $this->consumeNewLine();
+            }
 
             $message = '';
             if ($this->expects('    ')) {
diff --git a/tests/Gitonomy/Git/Tests/LogTest.php b/tests/Gitonomy/Git/Tests/LogTest.php
index cdf1563..970e55c 100644
--- a/tests/Gitonomy/Git/Tests/LogTest.php
+++ b/tests/Gitonomy/Git/Tests/LogTest.php
@@ -76,4 +76,19 @@ public function testIterable($repository)
             }
         }
     }
+
+    public function testFirstMessageEmpty()
+    {
+        $repository = $this->createEmptyRepository(false);
+        $repository->run('config', ['--local', 'user.name', '"Unit Test"']);
+        $repository->run('config', ['--local', 'user.email', '"unit_test@unit-test.com"']);
+
+        // Edge case: first commit lacks a message.
+        file_put_contents($repository->getWorkingDir().'/file', 'foo');
+        $repository->run('add', ['.']);
+        $repository->run('commit', ['--allow-empty-message', '--no-edit']);
+
+        $commits = $repository->getLog()->getCommits();
+        $this->assertCount(1, $commits);
+    }
 }