diff --git a/vrobbler/apps/scrobbles/constants.py b/vrobbler/apps/scrobbles/constants.py
index f86435e..e24d9fd 100644
--- a/vrobbler/apps/scrobbles/constants.py
+++ b/vrobbler/apps/scrobbles/constants.py
@@ -20,6 +20,7 @@ PLAY_AGAIN_MEDIA = {
     "beers": "Beer",
     "foods": "Food",
     "locations": "GeoLocation",
+    "videos": "Video",
 }
 
 MEDIA_END_PADDING_SECONDS = {
diff --git a/vrobbler/apps/scrobbles/views.py b/vrobbler/apps/scrobbles/views.py
index e72826b..09b1862 100644
--- a/vrobbler/apps/scrobbles/views.py
+++ b/vrobbler/apps/scrobbles/views.py
@@ -604,8 +604,7 @@ def scrobble_start(request, uuid):
             "[scrobble_start] media object not found",
             extra={"uuid": uuid, "user_id": user.id},
         )
-        # TODO Log that we couldn't find a media obj to scrobble
-        return
+        raise Exception("No media object provided to scrobble")
 
     scrobble = None
     user_id = request.user.id