diff --git a/Remotes.hs b/Remotes.hs
index 3774f993ce..f21f5a6ba4 100644
--- a/Remotes.hs
+++ b/Remotes.hs
@@ -6,8 +6,8 @@ module Remotes (
 	tryGitConfigRead
 ) where
 
+import Control.Exception
 import Control.Monad.State (liftIO)
-import IO
 import qualified Data.Map as Map
 import Data.String.Utils
 import List
@@ -85,7 +85,9 @@ tryGitConfigRead :: Git.Repo -> Annex (Maybe Git.Repo)
 tryGitConfigRead r = do
 	if (Map.null $ Git.configMap r)
 		then do
-			result <- liftIO $ try (Git.configRead r)
+			-- configRead can fail due to IO error or
+			-- for other reasons; catch all possible exceptions
+			result <- liftIO $ (try (Git.configRead r)::IO (Either SomeException (Git.Repo)))
 			case (result) of
 				Left err -> return Nothing
 				Right r' -> do
diff --git a/TODO b/TODO
index 5bef280e21..cd94f03bcb 100644
--- a/TODO
+++ b/TODO
@@ -8,6 +8,9 @@
 * Support for remote git repositories (ssh:// specifically can be made to
   work, although the other end probably needs to have git-annex installed..)
 
+* Copy files atomically, don't leaf a partial key on interrupt.
+  (Fix for URL download too..)
+
 * Find a way to copy a file with a progress bar, while still preserving 
   stat. Easiest way might be to use pv and fix up the permissions etc
   after?