code/cogs/skip.py

@@ -49,13 +49,8 @@ class Skip(commands.Cog):
                 for i in range(number - 2, -1, -1):
                     player.queue.pop(i)
 
-        # If there is a next song, get it
-        try:
-            next_song = player.queue[0]
-        except IndexError:
-            # If the song is on repeat, catch the IndexError and get the current song
-            # Otherwise, pass
-            if player.loop == 1:
+        # If the queue is empty, but the current song is on repeat
+        if player.loop == 1 and not player.queue:
             embed = create_embed(
                 title="Song on Repeat",
                 description=(