diff --git a/src/discord/MusicPlayer/Join.ts b/src/discord/MusicPlayer/Join.ts
index c2143ff..c22e6b8 100644
--- a/src/discord/MusicPlayer/Join.ts
+++ b/src/discord/MusicPlayer/Join.ts
@@ -48,7 +48,7 @@ const EMBEDS = {
     },
     MUSIC_ERROR: (data: Message | Interaction, err: Error) => {
         return makeErrorEmbed({
-            title: `Error`,
+            title: `Error while playing music, skipping this track`,
             description: `${err.message}`,
             user: (data instanceof Interaction) ? data.user : data.author
         });
@@ -152,6 +152,8 @@ export async function joinVoiceChannelProcedure (data: Interaction | Message, in
     // Register Event Listeners
     instance.events.on('playing', async (event: PlayerPlayingEvent) => {
 
+        if(!event.instance.queue || !event.instance.queue.track || event.instance.queue.track.length === 0) return;
+
         const row = new MessageActionRow()
             .addComponents(
                 new MessageButton()