diff --git a/Plan/src/main/java/com/djrapitops/plan/api/API.java b/Plan/src/main/java/com/djrapitops/plan/api/API.java
index 9107b7427..6b36d3211 100644
--- a/Plan/src/main/java/com/djrapitops/plan/api/API.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/API.java
@@ -82,8 +82,10 @@ public class API {
      * @return {@code ../player/PlayerName}
      */
     public String getPlayerInspectPageLink(String name) {
-        String link = "../player/" + name.replace(" ", "%20").replace(".", "%2E");
-        return link;
+        if (name == null) {
+            return  "#";
+        }
+        return "../player/" + name.replace(" ", "%20").replace(".", "%2E");
     }
 
     /**
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
index 39e43a582..cb219f3cb 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
@@ -116,9 +116,7 @@ public class Analysis {
             profile.addActiveSessions(new HashMap<>(SessionCache.getActiveSessions()));
             serverProfile = profile;
 
-            for (PlayerProfile player : profile.getPlayers()) {
-                dataCache.updateNames(player.getUuid(), player.getName(), null);
-            }
+            updatePlayerNameCache(profile, dataCache);
 
             long fetchPhaseLength = Benchmark.stop("Analysis", "Fetch Phase");
             setBannedByPlugins(profile);
@@ -150,6 +148,12 @@ public class Analysis {
         return true;
     }
 
+    private void updatePlayerNameCache(ServerProfile profile, DataCache dataCache) {
+        for (PlayerProfile player : profile.getPlayers()) {
+            dataCache.updateNames(player.getUuid(), player.getName(), null);
+        }
+    }
+
     private void setBannedByPlugins(ServerProfile profile) {
         UUID serverUUID = Plan.getServerUUID();
         List<BanData> banPlugins = plugin.getHookHandler().getAdditionalDataSources().stream()