diff --git a/nilmdb/fsck/fsck.py b/nilmdb/fsck/fsck.py
index 567ba3f..687c317 100644
--- a/nilmdb/fsck/fsck.py
+++ b/nilmdb/fsck/fsck.py
@@ -52,7 +52,7 @@ def err(format, *args):
 
 
 # Decorator that retries a function if it returns a specific value
-def retry_if_raised(exc, message=None, max_retries=100):
+def retry_if_raised(exc, message=None, max_retries=1000):
     def f1(func):
         def f2(*args, **kwargs):
             for n in range(max_retries):
@@ -60,7 +60,7 @@ def retry_if_raised(exc, message=None, max_retries=100):
                     return func(*args, **kwargs)
                 except exc:
                     if message:
-                        log("%s\n\n", message)
+                        log(f"{message} ({n+1})\n\n")
             raise Exception("Max number of retries (%d) exceeded; giving up" %
                             max_retries)
         return f2