diff --git a/src/main/java/nl/martenm/servertutorialplus/helpers/PluginUtils.java b/src/main/java/nl/martenm/servertutorialplus/helpers/PluginUtils.java
index abab423..38f6d4a 100644
--- a/src/main/java/nl/martenm/servertutorialplus/helpers/PluginUtils.java
+++ b/src/main/java/nl/martenm/servertutorialplus/helpers/PluginUtils.java
@@ -82,10 +82,12 @@ public static Location fromString(ServerTutorialPlus plugin, String message) {
         double x = Double.parseDouble(data[1]);
         double y = Double.parseDouble(data[2]);
         double z = Double.parseDouble(data[3]);
-        float yaw = Float.parseFloat(data[4]);
-        float pitch = Float.parseFloat(data[5]);
-        return new Location(plugin.getServer().getWorld(world), x, y, z, yaw, pitch);
-
+        if (data.size() == 6) {
+            float yaw = Float.parseFloat(data[4]);
+            float pitch = Float.parseFloat(data[5]);
+            return new Location(plugin.getServer().getWorld(world), x, y, z, yaw, pitch);
+        }
+        return new Location(plugin.getServer().getWorld(world), x, y, z);
     }
 
     public static String fromLocation(Location loc) {