diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
index 71d1d99..6121d00 100644
--- a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
+++ b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
@@ -2068,8 +2068,18 @@ public class GriefPrevention extends JavaPlugin
             //otherwise try to find the specified player
             else
             {
-                OfflinePlayer otherPlayer = Bukkit.getServer().getOfflinePlayer(args[0]);
-                uuid = otherPlayer.getUniqueId();
+                OfflinePlayer otherPlayer = this.resolvePlayerByName(args[0]);
+                if (otherPlayer == null)
+                {
+                    try {
+                        uuid = UUID.fromString(args[0]);
+                    } catch (IllegalArgumentException ignored) {
+                        GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound2);
+                        return true;
+                    }
+                } else {
+                    uuid = otherPlayer.getUniqueId();
+                }
             }
 
             //load the target player's data