Merge remote-tracking branch 'origin/master' into dev

Earleys · Sep 17, 2017 · 4087dd7 · 4087dd7
2 parents 383db10 + 4c2f5ba
commit 4087dd7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/LavalinkServer/src/main/java/lavalink/server/Launcher.java b/LavalinkServer/src/main/java/lavalink/server/Launcher.java
@@ -60,7 +60,7 @@ public Launcher(Config config, SocketServer socketServer) {
         SimpleLog.addListener(new SimpleLogToSLF4JAdapter());
         Launcher.config = config;
         this.socketServer = socketServer;
-        if (!config.getSentryDsn().isEmpty()) {
+        if (config.getSentryDsn() != null && !config.getSentryDsn().isEmpty()) {
             Sentry.init(config.getSentryDsn());
         }
     }