diff --git a/syng/client.py b/syng/client.py
index f471ec1..a7ca14e 100644
--- a/syng/client.py
+++ b/syng/client.py
@@ -334,6 +334,8 @@ class Client:
                 if entry.uuid not in self.skipped:
                     self.skipped = []
                     await self.player.play(video, audio, source.extra_mpv_options)
+            except ValueError as e:
+                logger.error("Error playing: %s", e)
             except Exception:  # pylint: disable=broad-except
                 print_exc()
         if self.skipped:
diff --git a/syng/sources/source.py b/syng/sources/source.py
index 950eb56..bdc0ff0 100644
--- a/syng/sources/source.py
+++ b/syng/sources/source.py
@@ -255,10 +255,11 @@ class Source(ABC):
             self.downloaded_files[entry.ident].video = video
             self.downloaded_files[entry.ident].audio = audio
             self.downloaded_files[entry.ident].complete = True
+        except ValueError as exc:
+            raise exc
         except Exception:  # pylint: disable=broad-except
             print_exc()
-            logger.error("Buffering failed for %s", entry)
-            self.downloaded_files[entry.ident].failed = True
+            raise ValueError("Buffering failed for %s" % entry)
 
         self.downloaded_files[entry.ident].ready.set()