diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java
index 749adee11..90be5a21e 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java
@@ -247,7 +247,7 @@ public class BukkitInformationManager extends InformationManager {
     public void cacheAnalysisHtml(String html) {
         if (usingAnotherWebServer) {
             try {
-                getWebAPI().getAPI(PostHtmlWebAPI.class).sendAnalysisHtml(webServerAddress, getAnalysisHtml());
+                getWebAPI().getAPI(PostHtmlWebAPI.class).sendAnalysisHtml(webServerAddress, html);
             } catch (WebAPIException e) {
                 attemptConnection();
                 cacheAnalysisHtml();
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java
index 00377188b..7a016d98c 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java
@@ -98,6 +98,7 @@ public class BungeeServerInfoManager {
             connectedToServer(server);
             return true;
         } catch (WebAPIException e) {
+            Log.debug(e.toString());
             serverHasGoneOffline(server.getUuid());
             return false;
         }
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/queue/Consumer.java b/Plan/src/main/java/com/djrapitops/plan/systems/queue/Consumer.java
index ed61ea773..9638d306f 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/queue/Consumer.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/queue/Consumer.java
@@ -42,7 +42,11 @@ public abstract class Consumer<T> extends AbsRunnable {
 
     protected void stop() {
         run = false;
-        super.cancel();
+        try {
+            super.cancel();
+        } catch (NullPointerException ignore) {
+            /*ignored*/
+        }
     }
 
     protected abstract void clearVariables();
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java
index 0f439286b..da586d960 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java
@@ -187,6 +187,7 @@ public class WebServer {
         if (server != null) {
             server.stop(0);
         }
+        enabled = false;
     }
 
     public String getProtocol() {