diff --git a/git-remote-hg b/git-remote-hg
index 6580227..fdc6a30 100755
--- a/git-remote-hg
+++ b/git-remote-hg
@@ -1255,12 +1255,10 @@ def main(args):
             die('unhandled command: %s' % line)
         sys.stdout.flush()
 
+    marks.store()
+
 def bye():
-    if not marks:
-        return
-    if not is_tmp:
-        marks.store()
-    else:
+    if is_tmp:
         shutil.rmtree(dirname)
 
 atexit.register(bye)