diff --git a/commands/music/pause.js b/commands/music/pause.js
index 8a44400..0e9e7b2 100644
--- a/commands/music/pause.js
+++ b/commands/music/pause.js
@@ -13,8 +13,8 @@ module.exports = {
 
         if (client.player.getQueue(message).paused) return message.channel.send(`${client.emotes.error} - The music is already paused !`);
 
-        client.player.pause(message);
+        const success = client.player.pause(message);
 
-        message.channel.send(`${client.emotes.success} - Song ${client.player.getQueue(message).playing.title} paused !`);
+        if (success) message.channel.send(`${client.emotes.success} - Song ${client.player.getQueue(message).playing.title} paused !`);
     },
 };
\ No newline at end of file
diff --git a/commands/music/resume.js b/commands/music/resume.js
index e3c0000..f3821c4 100644
--- a/commands/music/resume.js
+++ b/commands/music/resume.js
@@ -13,8 +13,8 @@ module.exports = {
 
         if (!client.player.getQueue(message).paused) return message.channel.send(`${client.emotes.error} - The music is already playing !`);
 
-        client.player.resume(message);
+        const success = client.player.resume(message);
 
-        message.channel.send(`${client.emotes.success} - Song ${client.player.getQueue(message).playing.title} resumed !`);
+        if (success) message.channel.send(`${client.emotes.success} - Song ${client.player.getQueue(message).playing.title} resumed !`);
     },
 };
\ No newline at end of file
diff --git a/commands/music/shuffle.js b/commands/music/shuffle.js
index 93f3d1c..efedfd2 100644
--- a/commands/music/shuffle.js
+++ b/commands/music/shuffle.js
@@ -11,8 +11,8 @@ module.exports = {
 
         if (!client.player.getQueue(message)) return message.channel.send(`${client.emotes.error} - No music currently playing !`);
 
-        client.player.shuffle(message);
+        const success = client.player.shuffle(message);
 
-        return message.channel.send(`${client.emotes.success} - Queue shuffled **${client.player.getQueue(message).tracks.length}** song(s) !`);
+        if (success) message.channel.send(`${client.emotes.success} - Queue shuffled **${client.player.getQueue(message).tracks.length}** song(s) !`);
     },
 };
\ No newline at end of file
diff --git a/commands/music/skip.js b/commands/music/skip.js
index d7f4fd3..6ac02b5 100644
--- a/commands/music/skip.js
+++ b/commands/music/skip.js
@@ -11,8 +11,8 @@ module.exports = {
 
         if (!client.player.getQueue(message)) return message.channel.send(`${client.emotes.error} - No music currently playing !`);
 
-        client.player.skip(message);
+        const success = client.player.skip(message);
 
-        message.channel.send(`${client.emotes.success} - The current music has just been **skipped** !`);
+        if (success) message.channel.send(`${client.emotes.success} - The current music has just been **skipped** !`);
     },
 };
\ No newline at end of file
diff --git a/commands/music/stop.js b/commands/music/stop.js
index 57bd31b..1dcbde4 100644
--- a/commands/music/stop.js
+++ b/commands/music/stop.js
@@ -12,8 +12,8 @@ module.exports = {
         if (!client.player.getQueue(message)) return message.channel.send(`${client.emotes.error} - No music currently playing !`);
 
         client.player.setRepeatMode(message, false);
-        client.player.stop(message);
+        const success = client.player.stop(message);
 
-        message.channel.send(`${client.emotes.success} - Music **stopped** into this server !`);
+        if (success) message.channel.send(`${client.emotes.success} - Music **stopped** into this server !`);
     },
 };
\ No newline at end of file
diff --git a/commands/music/volume.js b/commands/music/volume.js
index 80c5729..4f36f89 100644
--- a/commands/music/volume.js
+++ b/commands/music/volume.js
@@ -15,8 +15,8 @@ module.exports = {
 
         if (Math.round(parseInt(args[0])) < 1 || Math.round(parseInt(args[0])) > 100) return message.channel.send(`${client.emotes.error} - Please enter a valid number (between 1 and 100) !`);
 
-        client.player.setVolume(message, parseInt(args[0]));
+        const success = client.player.setVolume(message, parseInt(args[0]));
 
-        message.channel.send(`${client.emotes.success} - Volume set to **${parseInt(args[0])}%** !`);
+        if (success) message.channel.send(`${client.emotes.success} - Volume set to **${parseInt(args[0])}%** !`);
     },
 };
\ No newline at end of file
diff --git a/player/error.js b/player/error.js
index 47c6541..2a2d096 100644
--- a/player/error.js
+++ b/player/error.js
@@ -12,6 +12,9 @@ module.exports = (client, error, message, ...args) => {
         case 'VideoUnavailable':
             message.channel.send(`${client.emotes.error} - ${args[0].title} is not available in your country! Skipping...`);
             break;
+        case 'MusicStarting':
+            message.channel.send(`The music is starting... please wait and retry!`);
+            break;
         default:
             message.channel.send(`${client.emotes.error} - Something went wrong ... Error : ${error}`);
     };