diff --git a/src/main/java/eu/endermite/togglepvp/TogglePvp.java b/src/main/java/eu/endermite/togglepvp/TogglePvp.java
index f4f3ea8..8ce9b44 100644
--- a/src/main/java/eu/endermite/togglepvp/TogglePvp.java
+++ b/src/main/java/eu/endermite/togglepvp/TogglePvp.java
@@ -33,6 +33,7 @@ public final class TogglePvp extends JavaPlugin {
             getLogger().severe("Error with accessing database. Check if server has write rights.");
             getLogger().severe("Plugin will now disable.");
             getServer().getPluginManager().disablePlugin(this);
+            return;
         }
         playerManager = new PlayerManager();
 
diff --git a/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerJoinAndLeaveListener.java b/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerJoinAndLeaveListener.java
index d66ddfb..998d346 100644
--- a/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerJoinAndLeaveListener.java
+++ b/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerJoinAndLeaveListener.java
@@ -18,6 +18,9 @@ public class PlayerJoinAndLeaveListener implements Listener {
         Player player = event.getPlayer();
 
         PlayerData playerData = TogglePvp.getPlugin().getSqLite().getPlayerInfo(player.getUniqueId());
+
+        System.out.println(playerData.isPvpEnabled());
+
         TogglePvp.getPlugin().getPlayerManager().addPlayer(player.getUniqueId(), playerData);
     }
     /**
diff --git a/src/main/java/eu/endermite/togglepvp/util/DatabaseSQLite.java b/src/main/java/eu/endermite/togglepvp/util/DatabaseSQLite.java
index f024ca6..87e0c14 100644
--- a/src/main/java/eu/endermite/togglepvp/util/DatabaseSQLite.java
+++ b/src/main/java/eu/endermite/togglepvp/util/DatabaseSQLite.java
@@ -41,16 +41,12 @@ public class DatabaseSQLite {
         try {
             conn = DriverManager.getConnection(url);
             System.out.println("Connection to SQLite has been established.");
+            if (conn != null) {
+                conn.close();
+                return true;
+            }
         } catch (SQLException e) {
             System.out.println(e.getMessage());
-        } finally {
-            try {
-                if (conn != null) {
-                    conn.close();
-                }
-            } catch (SQLException ex) {
-                System.out.println(ex.getMessage());
-            }
         }
         return false;
     }
@@ -72,8 +68,9 @@ public class DatabaseSQLite {
             String sql = "SELECT * FROM `players` WHERE `player_uuid` = '" + uuid.toString() + "';";
             statement.execute(sql);
             ResultSet result = statement.getResultSet();
+            boolean state = result.getBoolean("pvpenabled");
             conn.close();
-            return new PlayerData(result.getBoolean("pvpenabled"));
+            return new PlayerData(state);
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 0e49eb9..fd00f20 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: TogglePvP
 version: ${project.version}
-main: eu.endermite.togglepvp.TogglePvP
+main: eu.endermite.togglepvp.TogglePvp
 authors: [YouHaveTrouble]
 api-version: 1.13
 description: PvP toggle plugin