diff --git a/morituri/rip/image.py b/morituri/rip/image.py
index 1dc0bee..48662d4 100644
--- a/morituri/rip/image.py
+++ b/morituri/rip/image.py
@@ -111,12 +111,12 @@ class Retag(logcommand.LogCommand):
             cueImage.setup(runner)
 
             mbdiscid = cueImage.table.getMusicBrainzDiscId()
-            if not mbdiscid:
+            prog.metadata = prog.getMusicBrainz(cueImage.table, mbdiscid)
+
+            if not prog.metadata:
                 print 'Not in MusicBrainz database, skipping'
                 continue
 
-            prog.metadata = prog.getMusicBrainz(cueImage.table, mbdiscid)
-
             # FIXME: this feels like we're poking at internals.
             prog.cuePath = arg
             prog.result = result.RipResult()