diff --git a/build.gradle b/build.gradle
index ad0c210..f5e708e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,7 @@ dependencies {
     implementation 'co.aikar:idb-core:1.0.0-SNAPSHOT'
     implementation 'com.zaxxer:HikariCP:2.4.1'
     implementation 'org.apache.commons:commons-lang3:3.6'
+    implementation 'mysql:mysql-connector-java:5.1.33'
     compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.2-SNAPSHOT'
     compileOnly name: 'languagy-1.2.6'
 }
diff --git a/src/main/java/net/islandearth/rpgregions/RPGRegions.java b/src/main/java/net/islandearth/rpgregions/RPGRegions.java
index 0d2d8e3..0baba6f 100644
--- a/src/main/java/net/islandearth/rpgregions/RPGRegions.java
+++ b/src/main/java/net/islandearth/rpgregions/RPGRegions.java
@@ -47,7 +47,7 @@ public final class RPGRegions extends JavaPlugin implements RPGRegionsAPI, Langu
 	public void onDisable() {
 		// Save all player data (quit event not called for shutdown)
 		Bukkit.getOnlinePlayers().forEach(player -> {
-			this.getManagers().getStorageManager().removeCachedAccount(player.getUniqueId());
+			if (plugin.getManagers().getStorageManager().getCachedAccounts().containsKey(player.getUniqueId())) this.getManagers().getStorageManager().removeCachedAccount(player.getUniqueId());
 		});
 
 		// Save all region configs
diff --git a/src/main/java/net/islandearth/rpgregions/managers/data/RPGRegionsCache.java b/src/main/java/net/islandearth/rpgregions/managers/data/RPGRegionsCache.java
index 76ae2e2..662e02f 100644
--- a/src/main/java/net/islandearth/rpgregions/managers/data/RPGRegionsCache.java
+++ b/src/main/java/net/islandearth/rpgregions/managers/data/RPGRegionsCache.java
@@ -1,6 +1,5 @@
 package net.islandearth.rpgregions.managers.data;
 
-import com.google.common.collect.ImmutableMap;
 import net.islandearth.rpgregions.RPGRegions;
 import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion;
 import org.jetbrains.annotations.Nullable;
@@ -31,6 +30,6 @@ public class RPGRegionsCache {
 	}
 
 	public Map<String, ConfiguredRegion> getConfiguredRegions() {
-		return ImmutableMap.copyOf(configuredRegions);
+		return configuredRegions;
 	}
 }
diff --git a/src/main/java/net/islandearth/rpgregions/managers/data/sql/SqlStorage.java b/src/main/java/net/islandearth/rpgregions/managers/data/sql/SqlStorage.java
index 7aff831..a0cfa02 100644
--- a/src/main/java/net/islandearth/rpgregions/managers/data/sql/SqlStorage.java
+++ b/src/main/java/net/islandearth/rpgregions/managers/data/sql/SqlStorage.java
@@ -29,7 +29,7 @@ public class SqlStorage implements StorageManager {
 		DatabaseOptions options = DatabaseOptions.builder().mysql(plugin.getConfig().getString("settings.sql.user"),
 				plugin.getConfig().getString("settings.sql.pass"),
 				plugin.getConfig().getString("settings.sql.db"),
-				plugin.getConfig().getString("sql.host") + ":" + plugin.getConfig().getString("sql.port")).build();
+				plugin.getConfig().getString("settings.sql.host") + ":" + plugin.getConfig().getString("settings.sql.port")).build();
 		Database db = PooledDatabaseOptions.builder().options(options).createHikariDatabase();
 		DB.setGlobalDatabase(db);
 		try {