diff --git a/anki/sync.py b/anki/sync.py
index f9f76f2a9..8e44a5b66 100644
--- a/anki/sync.py
+++ b/anki/sync.py
@@ -703,10 +703,7 @@ class MediaSyncer(object):
         if c != s:
             # if the sanity check failed, force a resync
             self.col.media.forceResync()
-            raise Exception("""\
-Media sanity check failed. Please copy and paste the text below:\n%s\n%s""" %
-                            (c, s))
-        return "success"
+            return "sanityCheckFailed"
 
     def removed(self):
         return self.col.media.removed()
diff --git a/aqt/sync.py b/aqt/sync.py
index b084eb290..0fc2c40a2 100644
--- a/aqt/sync.py
+++ b/aqt/sync.py
@@ -114,6 +114,10 @@ Please visit AnkiWeb, upgrade your deck, then try again."""))
             self._clockOff()
         elif evt == "checkFailed":
             self._checkFailed()
+        elif evt == "mediaSanity":
+            showWarning(_("""\
+A problem occurred while syncing media. Please sync again and Anki will \
+correct the issue."""))
         elif evt == "noChanges":
             pass
         elif evt == "fullSync":
@@ -382,6 +386,8 @@ class SyncThread(QThread):
         ret = self.client.sync(self.mediaUsn)
         if ret == "noChanges":
             self.fireEvent("noMediaChanges")
+        elif ret == "sanityCheckFailed":
+            self.fireEvent("mediaSanity")
         else:
             self.fireEvent("mediaSuccess")