diff --git a/ripcd.py b/ripcd.py
index 64bb382..0946838 100755
--- a/ripcd.py
+++ b/ripcd.py
@@ -239,7 +239,6 @@ def get_release_by_id(mbid):
             'labels',
         ],
     )
-    import pdb; pdb.set_trace()
     return res['release']
 
 
@@ -258,7 +257,10 @@ def get_release_list_from_device(device):
     if 'disc' in res:
         return res['disc']['release-list']
     else:
-        return res['release-list']
+        try:
+            return res['release-list']
+        except KeyError:
+            return []
 
 
 def parse_date(datestr):
@@ -360,6 +362,9 @@ def main():
             release = prompt_select_release(release_list)
         elif len(release_list) == 1:
             release = release_list[0]
+        else:
+            sys.stderr.write('Could not find a matching MusicBrainz release\n')
+            raise SystemExit(1)
 
     print('Ripping', format_release(release))