diff --git a/Plan/common/src/main/java/com/djrapitops/plan/identification/ServerServerInfo.java b/Plan/common/src/main/java/com/djrapitops/plan/identification/ServerServerInfo.java
index c25f6c5cf5..efe1d181ff 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/identification/ServerServerInfo.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/identification/ServerServerInfo.java
@@ -100,6 +100,7 @@ private Server registerNew() {
 
     private Server registerNew(ServerUUID serverUUID) {
         Server server = createServerObject(serverUUID);
+        logger.info("Registering a new server in database with UUID " + serverUUID);
         fromDatabase.save(server);
 
         Server stored = fromDatabase.load(serverUUID)
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/identification/storage/ServerDBLoader.java b/Plan/common/src/main/java/com/djrapitops/plan/identification/storage/ServerDBLoader.java
index b99355ef42..edeba6fa8d 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/identification/storage/ServerDBLoader.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/identification/storage/ServerDBLoader.java
@@ -59,6 +59,7 @@ public Optional<Server> load(ServerUUID serverUUID) {
 
     @Override
     public void save(Server server) {
+        if (server == null) return;
         try {
             dbSystem.getDatabase().executeTransaction(
                     new StoreServerInformationTransaction(server)
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/identification/storage/ServerFileLoader.java b/Plan/common/src/main/java/com/djrapitops/plan/identification/storage/ServerFileLoader.java
index 1974269bde..06898ffd35 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/identification/storage/ServerFileLoader.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/identification/storage/ServerFileLoader.java
@@ -53,6 +53,7 @@ public ServerFileLoader(
     }
 
     public void prepare() throws IOException {
+        read();
         try (ConfigReader reader = new ConfigReader(files.getResourceFromJar("DefaultServerInfoFile.yml").asInputStream())) {
             copyMissing(reader.read());
         }