diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/service/ProtocolDetectorService.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/service/ProtocolDetectorService.java
index a940a603e..c1e0cebd1 100644
--- a/bungee/src/main/java/us/myles/ViaVersion/bungee/service/ProtocolDetectorService.java
+++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/service/ProtocolDetectorService.java
@@ -54,7 +54,7 @@ public class ProtocolDetectorService implements Runnable {
         serverInfo.ping(new Callback<ServerPing>() {
             @Override
             public void done(ServerPing serverPing, Throwable throwable) {
-                if (throwable == null) {
+                if (throwable == null && serverPing != null && serverPing.getVersion() != null) {
                     detectedProtocolIds.put(key, serverPing.getVersion().getProtocol());
                     if (((BungeeConfigAPI) Via.getConfig()).isBungeePingSave()) {
                         Map<String, Integer> servers = ((BungeeConfigAPI) Via.getConfig()).getBungeeServerProtocols();
@@ -69,7 +69,6 @@ public class ProtocolDetectorService implements Runnable {
                         }
                         // Save
                         Via.getPlatform().getConfigurationProvider().saveConfig();
-
                     }
                 }
             }