diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java
index e5d9b976..12633df7 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java
@@ -46,7 +46,7 @@ public class PlayerDestination implements MVDestination {
             plLoc = (Player) e.getPassenger();
         }
 
-        if (p != null && plLoc != null && !plLoc.getName().equalsIgnoreCase(p.getName())) {
+        if (p != null && plLoc != null) {
             return p.getLocation();
         }
         return null;
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java b/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java
index befd6f6b..81333e8a 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java
@@ -132,6 +132,9 @@ public class LocationManipulation {
      * @return The {@link String}
      */
     public static String strCoordsRaw(Location l) {
+        if(l == null) {
+            return "null";
+        }
         String result = "";
         DecimalFormat df = new DecimalFormat();
         df.setMinimumFractionDigits(0);