diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
index c2a7bd4..43827c0 100644
--- a/plugin/fugitive.vim
+++ b/plugin/fugitive.vim
@@ -697,7 +697,8 @@ function! s:Commit(args) abort
       endif
       return ''
     else
-      let error = get(readfile(errorfile),-2,'!')
+      let errors = readfile(errorfile)
+      let error = get(errors,-2,get(errors,-1,'!'))
       if error =~# "'false'\\.$"
         let args = a:args
         let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-[se]|--edit|--interactive)%($| )','')