@@ -75,6 +75,8 @@ def download_media(self,
         Raises:
             :class:`Error <pyrogram.Error>`
         """
+        error_message = "This message doesn't contain any downloadable media"
+
         if isinstance(message, pyrogram_types.Message):
             if message.photo:
                 media = pyrogram_types.Document(
@@ -98,7 +100,7 @@ def download_media(self,
             elif message.gif:
                 media = message.gif
             else:
-                return
+                raise ValueError(error_message)
         elif isinstance(message, (
                 pyrogram_types.Photo,
                 pyrogram_types.PhotoSize,
@@ -126,7 +128,7 @@ def download_media(self,
                 mime_type=""
             )
         else:
-            return
+            raise ValueError(error_message)
 
         done = Event()
         path = [None]