diff --git a/anki/decks.py b/anki/decks.py
index cf7a3aaca..f846e3b78 100644
--- a/anki/decks.py
+++ b/anki/decks.py
@@ -163,6 +163,9 @@ class DeckManager(object):
         "A list of all decks."
         return self.decks.values()
 
+    def count(self):
+        return len(self.decks)
+
     def get(self, did, default=True):
         id = str(did)
         if id in self.decks:
diff --git a/anki/sync.py b/anki/sync.py
index bf9cb03c8..23a843cca 100644
--- a/anki/sync.py
+++ b/anki/sync.py
@@ -565,7 +565,7 @@ class MediaSyncer(object):
             runHook("sync", "streamMedia")
             zip = self.files()
             usn = self.server.addFiles(zip=zip)
-            if usn:
+            if usn is not False:
                 # when server has run out of files, it returns bumped usn
                 break
         # step 5: finalize