From 9237ae3ef0d323601938d1a17961356f695b2da3 Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Thu, 7 Jun 2018 10:52:17 +0300
Subject: [PATCH] Attempts to fix #602

---
 .../system/database/databases/sql/operation/SQLFetchOps.java   | 3 +++
 .../plan/system/webserver/pages/parsing/AnalysisPage.java      | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
index 91734debb..43a9650d1 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
@@ -64,6 +64,9 @@ public class SQLFetchOps extends SQLOps implements FetchOperations {
 
             for (UserInfo userInfo : serverUserInfo) {
                 UUID uuid = userInfo.getUuid();
+                if (uuid == null) {
+                    continue;
+                }
                 PlayerProfile profile = new PlayerProfile(uuid, userInfo.getName(), userInfo.getRegistered());
                 profile.setTimesKicked(timesKicked.getOrDefault(uuid, 0));
                 if (userInfo.isBanned()) {
diff --git a/Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/AnalysisPage.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/AnalysisPage.java
index 74058108d..f86162869 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/AnalysisPage.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/AnalysisPage.java
@@ -9,6 +9,7 @@ import com.djrapitops.plan.data.calculation.AnalysisData;
 import com.djrapitops.plan.system.webserver.response.errors.ErrorResponse;
 import com.djrapitops.plan.utilities.file.FileUtil;
 import com.djrapitops.plan.utilities.html.HtmlUtils;
+import com.djrapitops.plugin.utilities.Verify;
 
 import java.io.IOException;
 
@@ -22,6 +23,7 @@ public class AnalysisPage extends Page {
     private final AnalysisData data;
 
     public AnalysisPage(AnalysisData analysisData) {
+        Verify.nullCheck(analysisData, () -> new IllegalArgumentException("Analysis failed, data object was null"));
         this.data = analysisData;
     }