diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java
index eafc501..0cee6cd 100644
--- a/src/main/java/com/bbn/hadder/audio/AudioManager.java
+++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java
@@ -31,12 +31,18 @@ public class AudioManager {
     }
 
     public static Map<String, Map.Entry<AudioPlayer, TrackManager>> players = new HashMap<>();
-    public final AudioPlayerManager myManager = new DefaultAudioPlayerManager();
+    private final AudioPlayerManager myManager = new DefaultAudioPlayerManager();
 
     public boolean hasPlayer(Guild guild) {
         return players.containsKey(guild.getId());
     }
 
+    public static void removePlayer(Guild g) {
+        System.out.println(players.toString());
+        players.remove(g.getId());
+        System.out.println(players.toString());
+    }
+
     public AudioPlayer getPlayer(Guild guild) {
         AudioPlayer p;
         if (hasPlayer(guild)) {
diff --git a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java
index 70bbb2c..33c03f9 100644
--- a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java
@@ -13,13 +13,17 @@ public class StopCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
-        AudioManager.players.remove(event.getGuild().getId());
-        new AudioManager().getPlayer(event.getGuild()).destroy();
-        new AudioManager().getTrackManager(event.getGuild()).purgeQueue();
-        event.getGuild().getAudioManager().closeAudioConnection();
-        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                "commands.music.stop.success.title",
-                "commands.music.stop.success.description").build()).queue();
+        if (new AudioManager().hasPlayer(event.getGuild())) {
+            AudioManager.removePlayer(event.getGuild());
+            new AudioManager().getPlayer(event.getGuild()).destroy();
+            new AudioManager().getTrackManager(event.getGuild()).purgeQueue();
+            event.getGuild().getAudioManager().closeAudioConnection();
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                    "commands.music.stop.success.title",
+                    "commands.music.stop.success.description").build()).queue();
+        } else {
+            event.getTextChannel().sendMessage("I love you <3").queue();
+        }
     }
 
     @Override