diff --git a/paper-api/src/main/java/org/bukkit/Location.java b/paper-api/src/main/java/org/bukkit/Location.java
index f4b8c98972..4afabd8873 100644
--- a/paper-api/src/main/java/org/bukkit/Location.java
+++ b/paper-api/src/main/java/org/bukkit/Location.java
@@ -360,11 +360,7 @@ public class Location implements Cloneable {
      * @throws IllegalArgumentException for differing worlds
      */
     public double distance(Location o) {
-        if (o == null || o.getWorld() != getWorld()) {
-            throw new IllegalArgumentException("Cannot measure distance between worlds or to null");
-        }
-
-        return Math.sqrt(Math.pow(x - o.x, 2) + Math.pow(y - o.y, 2) + Math.pow(z - o.z, 2));
+        return Math.sqrt(distanceSquared(o));
     }
 
     /**
@@ -376,8 +372,10 @@ public class Location implements Cloneable {
      * @throws IllegalArgumentException for differing worlds
      */
     public double distanceSquared(Location o) {
-        if (o == null || o.getWorld() != getWorld()) {
-            throw new IllegalArgumentException("Cannot measure distance between worlds or to null");
+        if (o == null) {
+            throw new IllegalArgumentException("Cannot measure distance to a null world");
+        } else if (o == null || o.getWorld() != getWorld()) {
+            throw new IllegalArgumentException("Cannot measure distance between " + getWorld().getName() + " and " + o.getWorld().getName());
         }
 
         return Math.pow(x - o.x, 2) + Math.pow(y - o.y, 2) + Math.pow(z - o.z, 2);