diff --git a/build.gradle.kts b/build.gradle.kts
index b411baa..1683264 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "dev.protron"
-version = "0.0.5-dev"
+version = "0.0.5"
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/dev/protron/coordsave/Commands.java b/src/main/java/dev/protron/coordsave/Commands.java
index ef86626..3c3d62f 100644
--- a/src/main/java/dev/protron/coordsave/Commands.java
+++ b/src/main/java/dev/protron/coordsave/Commands.java
@@ -27,7 +27,7 @@ public class Commands {
         checkPstmt.setString(2, coordname);
         ResultSet checkResult = checkPstmt.executeQuery();
 
-        if (Objects.equals(checkResult.getString("coordname"), coordname)) {
+        if (checkResult.getString("coordname") != null) {
             TextComponent alreadyExistMessage = text()
                     .content("A entry with the name ")
                     .append(text(coordname)).color(TextColor.color(RED))
@@ -46,10 +46,10 @@ public class Commands {
             // Executing the query
             pstmt.executeUpdate();
 
-            String validateQuery = "SELECT * FROM coords WHERE uuid = ? and coordname = ?";
+            String validateQuery = "SELECT * FROM coords WHERE uuid = ? AND coordname = ?";
             PreparedStatement validatePstmt = connection.prepareStatement(validateQuery);
-            checkPstmt.setString(1, playerUUID);
-            checkPstmt.setString(2, coordname);
+            validatePstmt.setString(1, playerUUID);
+            validatePstmt.setString(2, coordname);
             ResultSet validateResult = validatePstmt.executeQuery();
 
             if (Objects.equals(validateResult.getString("coordname"), coordname)) {
diff --git a/src/main/java/dev/protron/coordsave/CoordSave.java b/src/main/java/dev/protron/coordsave/CoordSave.java
index 1b8da17..609bf73 100644
--- a/src/main/java/dev/protron/coordsave/CoordSave.java
+++ b/src/main/java/dev/protron/coordsave/CoordSave.java
@@ -63,7 +63,6 @@ public class CoordSave extends JavaPlugin {
                             final TextComponent errorMessage = text()
                                     .content("No name provided").color(color(RED))
                                     .build();
-
                             player.sendMessage(errorMessage);
                             yield false;
                         }