--- a/contrib/vim/hgcommand.vim	Sat Jul 12 02:23:17 2014 -0700
+++ b/contrib/vim/hgcommand.vim	Sat Jul 19 00:10:22 2014 -0500
@@ -105,7 +105,7 @@
   let fileName=<SID>HGResolveLink(a:fileName)
   let newCwd=fnamemodify(fileName, ':h')
   if strlen(newCwd) > 0
-    execute 'cd' escape(newCwd, ' ')
+    try | execute 'cd' escape(newCwd, ' ') | catch | | endtry
   endif
   return oldCwd
 endfunction
@@ -396,7 +396,7 @@
 
     return returnExpression
   finally
-    execute 'cd' escape(oldCwd, ' ')
+    try | execute 'cd' escape(oldCwd, ' ') | catch | | endtry
   endtry
 endfunction