diff --git a/pom.xml b/pom.xml
index d5dbe5d..9779162 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>dev.lavalink.youtube</groupId>
             <artifactId>v2</artifactId>
-            <version>1.11.4</version>
+            <version>1.11.5</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/me/bobert/netneutrality/hooks/EventsHandler.java b/src/main/java/me/bobert/netneutrality/hooks/EventsHandler.java
index f06db8e..127533d 100644
--- a/src/main/java/me/bobert/netneutrality/hooks/EventsHandler.java
+++ b/src/main/java/me/bobert/netneutrality/hooks/EventsHandler.java
@@ -123,16 +123,16 @@ public class EventsHandler implements EventListener {
 
                 if (context instanceof CommandContext commandContext) {
                     handleCommand(commandContext);
-                    return;
                 }
 
                 if (context instanceof TaskContext taskContext) {
                     handleTask(taskContext);
-                    return;
                 }
+
+                break;
             }
 
-            eventClass = eventClass.getSuperclass(); // Move up the hierarchy
+            eventClass = eventClass.getSuperclass();
         }
     }
 
diff --git a/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java b/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java
index cba619c..7b3002e 100644
--- a/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java
+++ b/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java
@@ -62,6 +62,8 @@ public class TrackLoadingHandler implements AudioLoadResultHandler {
 
     @Override
     public void noMatches() {
+        logger.debug("Guild {}: no matches for identifier {}", guild.getId(), identifier);
+
         if (!silent)
             context.reply("No matches found");
     }
@@ -69,9 +71,12 @@ public class TrackLoadingHandler implements AudioLoadResultHandler {
     @Override
     public void loadFailed(FriendlyException e) {
         logger.debug("Guild {}: load failed for identifier {}", guild.getId(), identifier, e);
-        LogHandler.log(e);
+
+        //TODO: better error messages
+        RuntimeException exception = new RuntimeException("Failed to load track: " + e.getMessage(), e);
+        LogHandler.log(exception);
 
         if (!silent)
-            context.reply(MessageFunction.buildSentryErrorMessage(new RuntimeException("Failed to load track: " + e.getMessage(), e)));
+            context.reply(MessageFunction.buildSentryErrorMessage(exception));
     }
 }