diff --git a/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/CheckLinked.java b/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/CheckLinked.java
index db98c38..95ed7c1 100644
--- a/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/CheckLinked.java
+++ b/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/CheckLinked.java
@@ -46,11 +46,13 @@ public class CheckLinked implements SubCommand {
         Optional<Player> optionalPlayer = DiscordLink.getPlugin().getProxy().getPlayer(args[1]);
         if (optionalPlayer.isEmpty())
         {
-            optionalPlayer = DiscordLink.getPlugin().getProxy()
-                    .getPlayer(UUID.fromString(DiscordLink.getPlugin().getDatabase().uuidFromName(args[1])));
+            String uuidFromName = DiscordLink.getPlugin().getDatabase().uuidFromName(args[1]);
+            if (uuidFromName != null)
+                optionalPlayer = DiscordLink.getPlugin().getProxy()
+                        .getPlayer(UUID.fromString(uuidFromName));
             if (optionalPlayer.isEmpty())
             {
-                source.sendMessage(miniMessage.parse(Config.INVALID_PLAYER));
+                source.sendMessage(miniMessage.parse(Config.INVALID_PLAYER, Template.of("player", args[1])));
                 return;
             }
         }
diff --git a/src/main/java/com/alttd/proxydiscordlink/database/Database.java b/src/main/java/com/alttd/proxydiscordlink/database/Database.java
index af45dbf..f94e679 100644
--- a/src/main/java/com/alttd/proxydiscordlink/database/Database.java
+++ b/src/main/java/com/alttd/proxydiscordlink/database/Database.java
@@ -255,11 +255,11 @@ public class Database {
     public String uuidFromName(String playerName) {
         try {
             PreparedStatement statement = DatabaseConnection.getConnection()
-                    .prepareStatement("SELECT * FROM linked_accounts WHERE player_name = '" + playerName + "'");
+                    .prepareStatement("SELECT player_uuid FROM linked_accounts WHERE player_name = '" + playerName + "'");
             ResultSet resultSet = statement.executeQuery();
 
             if (resultSet.next()) {
-                return resultSet.getString("player_name");
+                return resultSet.getString("player_uuid");
             }
         } catch (SQLException exception) {
             exception.printStackTrace();