diff --git a/happy_ripper.py b/happy_ripper.py
index 2ee1b58..6d2e10e 100644
--- a/happy_ripper.py
+++ b/happy_ripper.py
@@ -134,11 +134,11 @@ def find_release_info(url: str) -> ReleaseInfo:
 
     entries = info.get("entries")
     if entries is None:
-        raise RipError("Entries is none")
-
-    first_entry = next(iter(entries), None)
-    if not first_entry:
-        raise RipError("Entries is empty")
+        first_entry = info
+    else:
+        first_entry = next(iter(entries), None)
+        if not first_entry:
+            raise RipError("Entries is empty")
 
     artist = first_entry.get("uploader")
     if artist is None:
@@ -225,6 +225,9 @@ if __name__ == "__main__":
             current_release_status_message = x
 
         if finished:
+            if current_release_info is None:
+                current_release_info = ReleaseInfo("Unknown", "Unknown", "url", False, False)
+
             finished_queue.append(ReleaseStatus(current_release_info, current_release_status_message))
             current_release_info = None
             current_release_status_message = "Waiting"