diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
index 3ef4b62..f1201b9 100644
--- a/plugin/fugitive.vim
+++ b/plugin/fugitive.vim
@@ -728,7 +728,7 @@ endfunction
 
 augroup fugitive_commit
   autocmd!
-  autocmd BufDelete *.git/COMMIT_EDITMSG execute s:sub(s:FinishCommit(), '^echoerr (.*)', 'echohl ErrorMsg|echo \1|echohl NONE')
+  autocmd VimLeavePre,BufDelete *.git/COMMIT_EDITMSG execute s:sub(s:FinishCommit(), '^echoerr (.*)', 'echohl ErrorMsg|echo \1|echohl NONE')
 augroup END
 
 " }}}1