diff --git a/Plan/dependency-reduced-pom.xml b/Plan/dependency-reduced-pom.xml
index 2a9978de3..b52e8a198 100644
--- a/Plan/dependency-reduced-pom.xml
+++ b/Plan/dependency-reduced-pom.xml
@@ -62,6 +62,15 @@
               <exclude>junit:*</exclude>
             </excludes>
           </artifactSet>
+            <relocations>
+                <relocation>
+                    <pattern>org.apache</pattern>
+                    <shadedPattern>plan.org.apache</shadedPattern>
+                    <excludes>
+                        <exclude>org.apache.logging.*</exclude>
+                    </excludes>
+                </relocation>
+            </relocations>
         </configuration>
       </plugin>
       <plugin>
@@ -260,7 +269,7 @@
     <dependency>
       <groupId>org.spongepowered</groupId>
       <artifactId>spongeapi</artifactId>
-      <version>7.0.0</version>
+        <version>LATEST</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
diff --git a/Plan/pom.xml b/Plan/pom.xml
index 1fcc381f8..ca2b23d6a 100644
--- a/Plan/pom.xml
+++ b/Plan/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>spongeapi</artifactId>
-            <version>7.0.0</version>
+            <version>LATEST</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
@@ -195,6 +195,9 @@
                         <relocation>
                             <pattern>org.apache</pattern>
                             <shadedPattern>plan.org.apache</shadedPattern>
+                            <excludes>
+                                <exclude>org.apache.logging.*</exclude>
+                            </excludes>
                         </relocation>
                     </relocations>
                 </configuration>
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageConDebugCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageConDebugCommand.java
index 07036d91a..9a8f8055e 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageConDebugCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageConDebugCommand.java
@@ -50,6 +50,10 @@ public class ManageConDebugCommand extends CommandNode {
         try {
             List<Server> servers = Database.getActive().fetch().getServers();
 
+            if (servers.isEmpty()) {
+                sender.sendMessage("§cNo Servers found in the database.");
+            }
+
             String accessAddress = WebServerSystem.getInstance().getWebServer().getAccessAddress();
             UUID thisServer = ServerInfo.getServerUUID();
             for (Server server : servers) {
diff --git a/Plan/src/main/java/com/djrapitops/plan/system/database/DBSystem.java b/Plan/src/main/java/com/djrapitops/plan/system/database/DBSystem.java
index 54cbd3472..73393e5ec 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/database/DBSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/DBSystem.java
@@ -50,7 +50,8 @@ public abstract class DBSystem implements SubSystem {
             Benchmark.stop("Enable", "Init Database");
         } catch (DBInitException e) {
             Throwable cause = e.getCause();
-            throw new EnableException(db.getName() + " init failure: " + cause.getMessage(), cause);
+            String message = cause == null ? e.getMessage() : cause.getMessage();
+            throw new EnableException((db != null ? db.getName() : "Database") + " init failure: " + message, cause);
         }
     }
 
diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/request/SaveDBSettingsRequest.java b/Plan/src/main/java/com/djrapitops/plan/system/info/request/SaveDBSettingsRequest.java
index 63a64136c..a5522ab18 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/SaveDBSettingsRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/SaveDBSettingsRequest.java
@@ -4,7 +4,7 @@
  */
 package com.djrapitops.plan.system.info.request;
 
-import com.djrapitops.plan.Plan;
+import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.connection.BadRequestException;
 import com.djrapitops.plan.api.exceptions.connection.WebException;
 import com.djrapitops.plan.system.settings.Settings;
@@ -64,7 +64,7 @@ public class SaveDBSettingsRequest extends InfoRequestWithVariables implements S
             Log.info("----------------------------------");
             return DefaultResponses.SUCCESS.get();
         } finally {
-            Plan.getInstance().reloadPlugin(true);
+            PlanPlugin.getInstance().reloadPlugin(true);
         }
     }