From 89bc90d0b588fe4504b794338bc341e69452c445 Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Sun, 31 Mar 2019 15:40:56 +0300
Subject: [PATCH] Fix bad merge

---
 .../plan/system/info/server/ServerServerInfo.java    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerServerInfo.java b/Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerServerInfo.java
index 0e1e004a3..c6e31ddf2 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerServerInfo.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerServerInfo.java
@@ -107,12 +107,18 @@ public class ServerServerInfo extends ServerInfo {
         }
     }
 
-    private Server updateDbInfo(UUID serverUUID) throws InterruptedException, ExecutionException, IOException {
+    private void updateDbInfo(UUID serverUUID) {
         Database db = dbSystem.getDatabase();
 
         Optional<Server> foundServer = db.query(ServerQueries.fetchServerMatchingIdentifier(serverUUID));
         if (!foundServer.isPresent()) {
-            server = registerServer(serverUUID);
+            try {
+                server = registerServer(serverUUID);
+            } catch (ExecutionException | IOException e) {
+                errorHandler.log(L.CRITICAL, this.getClass(), e);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
             return;
         }
 
@@ -132,7 +138,7 @@ public class ServerServerInfo extends ServerInfo {
         db.executeTransaction(new StoreServerInformationTransaction(server));
     }
 
-    private Server registerServer() throws Exception {
+    private Server registerServer() throws ExecutionException, InterruptedException, IOException {
         return registerServer(generateNewUUID());
     }