diff --git a/EssentialsDiscordLink/src/main/java/net/essentialsx/discordlink/AccountStorage.java b/EssentialsDiscordLink/src/main/java/net/essentialsx/discordlink/AccountStorage.java
index 68bf0552a..f7d95b582 100644
--- a/EssentialsDiscordLink/src/main/java/net/essentialsx/discordlink/AccountStorage.java
+++ b/EssentialsDiscordLink/src/main/java/net/essentialsx/discordlink/AccountStorage.java
@@ -39,7 +39,6 @@ public class AccountStorage {
             throw new IOException("Unable to create account file!");
         }
         try (final Reader reader = new FileReader(accountFile)) {
-            //noinspection UnstableApiUsage
             final Map<String, String> map = gson.fromJson(reader, new TypeToken<Map<String, String>>() {}.getType());
             uuidToDiscordIdMap = map == null ? Maps.synchronizedBiMap(HashBiMap.create()) : Maps.synchronizedBiMap(HashBiMap.create(map));
         }
@@ -74,15 +73,19 @@ public class AccountStorage {
     }
 
     public boolean remove(final UUID uuid) {
-        final boolean success = uuidToDiscordIdMap.remove(uuid.toString()) != null;
-        queueSave();
-        return success;
+        if (uuidToDiscordIdMap.remove(uuid.toString()) != null) {
+            queueSave();
+            return true;
+        }
+        return false;
     }
 
     public boolean remove(final String discordId) {
-        final boolean success = uuidToDiscordIdMap.values().removeIf(discordId::equals);
-        queueSave();
-        return success;
+        if (uuidToDiscordIdMap.values().removeIf(discordId::equals)) {
+            queueSave();
+            return true;
+        }
+        return false;
     }
 
     public UUID getUUID(final String discordId) {