1 files changed, 7 insertions, 3 deletions
diff --git a/Core.hs b/Core.hs
index e3702044e..9da4f3f2e 100644
--- a/Core.hs
+++ b/Core.hs
@@ -185,9 +185,13 @@ getKeysPresent = do
 	getKeysPresent' $ annexObjectDir g
 getKeysPresent' :: FilePath -> Annex [Key]
 getKeysPresent' dir = do
-	contents <- liftIO $ getDirectoryContents dir
-	files <- liftIO $ filterM present contents
-	return $ map fileKey files
+	exists <- liftIO $ doesDirectoryExist dir
+	if (not exists)
+		then return []
+		else do
+			contents <- liftIO $ getDirectoryContents dir
+			files <- liftIO $ filterM present contents
+			return $ map fileKey files
 	where
 		present d = do
 			result <- try $