diff --git a/beets/mediafile.py b/beets/mediafile.py
index 81036ffa4..301e0f370 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -1237,6 +1237,9 @@ class MediaFile(object):
         # Isolate bugs in Mutagen.
         try:
             self.mgfile.save(**kwargs)
+        except (IOError, OSError):
+            # Propagate these through: they don't represent Mutagen bugs.
+            raise
         except Exception as exc:
             log.debug(traceback.format_exc())
             log.error('uncaught Mutagen exception in save: {0}'.format(exc))