diff --git a/src/main/java/com/massivecraft/factions/SavageFactions.java b/src/main/java/com/massivecraft/factions/SavageFactions.java
index 63f8e3a2..048cc187 100644
--- a/src/main/java/com/massivecraft/factions/SavageFactions.java
+++ b/src/main/java/com/massivecraft/factions/SavageFactions.java
@@ -215,11 +215,8 @@ public class SavageFactions extends MPlugin {
         }
 
 
-
-
-
-        setupPlaceholderAPI();
-        postEnable();
+      this.setupPlaceholderAPI();
+      this.postEnable();
         this.loadSuccessful = true;
     }
 
diff --git a/src/main/java/com/massivecraft/factions/util/LazyLocation.java b/src/main/java/com/massivecraft/factions/util/LazyLocation.java
index a141bbc7..985ce2db 100644
--- a/src/main/java/com/massivecraft/factions/util/LazyLocation.java
+++ b/src/main/java/com/massivecraft/factions/util/LazyLocation.java
@@ -12,90 +12,90 @@ import java.io.Serializable;
  */
 
 public class LazyLocation implements Serializable {
-    private static final long serialVersionUID = -6049901271320963314L;
-    private transient Location location = null;
-    private String worldName;
-    private double x;
-    private double y;
-    private double z;
-    private float pitch;
-    private float yaw;
+  private static final long serialVersionUID = - 6049901271320963314L;
+  private transient Location location = null;
+  private String worldName;
+  private double x;
+  private double y;
+  private double z;
+  private float pitch;
+  private float yaw;
 
-    public LazyLocation(Location loc) {
-        setLocation(loc);
+  public LazyLocation(Location loc) {
+    setLocation(loc);
+  }
+
+  public LazyLocation(final String worldName, final double x, final double y, final double z) {
+    this(worldName, x, y, z, 0, 0);
+  }
+
+  public LazyLocation(final String worldName, final double x, final double y, final double z, final float yaw, final float pitch) {
+    this.worldName = worldName;
+    this.x = x;
+    this.y = y;
+    this.z = z;
+    this.yaw = yaw;
+    this.pitch = pitch;
+  }
+
+  // This returns the actual Location
+  public final Location getLocation() {
+    // make sure Location is initialized before returning it
+    initLocation();
+    return location;
+  }
+
+  // change the Location
+  public final void setLocation(Location loc) {
+    this.location = loc;
+    this.worldName = loc.getWorld().getName();
+    this.x = loc.getX();
+    this.y = loc.getY();
+    this.z = loc.getZ();
+    this.yaw = loc.getYaw();
+    this.pitch = loc.getPitch();
+  }
+
+
+  // This initializes the Location
+  private void initLocation() {
+    // if location is already initialized, simply return
+    if (location != null) {
+      return;
     }
 
-    public LazyLocation(final String worldName, final double x, final double y, final double z) {
-        this(worldName, x, y, z, 0, 0);
+    // get World; hopefully it's initialized at this point
+    World world = Bukkit.getWorld(worldName);
+    if (world == null) {
+      return;
     }
 
-    public LazyLocation(final String worldName, final double x, final double y, final double z, final float yaw, final float pitch) {
-        this.worldName = worldName;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.yaw = yaw;
-        this.pitch = pitch;
-    }
-
-    // This returns the actual Location
-    public final Location getLocation() {
-        // make sure Location is initialized before returning it
-        initLocation();
-        return location;
-    }
-
-    // change the Location
-    public final void setLocation(Location loc) {
-        this.location = loc;
-        this.worldName = loc.getWorld().getName();
-        this.x = loc.getX();
-        this.y = loc.getY();
-        this.z = loc.getZ();
-        this.yaw = loc.getYaw();
-        this.pitch = loc.getPitch();
-    }
+    // store the Location for future calls, and pass it on
+    location = new Location(world, x, y, z, yaw, pitch);
+  }
 
 
-    // This initializes the Location
-    private void initLocation() {
-        // if location is already initialized, simply return
-        if (location != null) {
-            return;
-        }
+  public final String getWorldName() {
+    return worldName;
+  }
 
-        // get World; hopefully it's initialized at this point
-        World world = Bukkit.getWorld(worldName);
-        if (world == null) {
-            return;
-        }
+  public final double getX() {
+    return x;
+  }
 
-        // store the Location for future calls, and pass it on
-        location = new Location(world, x, y, z, yaw, pitch);
-    }
+  public final double getY() {
+    return y;
+  }
 
+  public final double getZ() {
+    return z;
+  }
 
-    public final String getWorldName() {
-        return worldName;
-    }
+  public final double getPitch() {
+    return pitch;
+  }
 
-    public final double getX() {
-        return x;
-    }
-
-    public final double getY() {
-        return y;
-    }
-
-    public final double getZ() {
-        return z;
-    }
-
-    public final double getPitch() {
-        return pitch;
-    }
-
-    public final double getYaw() {
-        return yaw;
-    }
+  public final double getYaw() {
+    return yaw;
+  }
 }
diff --git a/src/main/java/com/massivecraft/factions/util/LocationTypeAdapter.java b/src/main/java/com/massivecraft/factions/util/LocationTypeAdapter.java
index a4c8401f..62c297e5 100644
--- a/src/main/java/com/massivecraft/factions/util/LocationTypeAdapter.java
+++ b/src/main/java/com/massivecraft/factions/util/LocationTypeAdapter.java
@@ -1,32 +1,48 @@
 package com.massivecraft.factions.util;
 
 import com.google.gson.*;
+import com.massivecraft.factions.SavageFactions;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 
 import java.lang.reflect.Type;
+import java.util.logging.Level;
 
 public class LocationTypeAdapter implements JsonSerializer<Location>, JsonDeserializer<Location> {
 
     @Override
     public JsonElement serialize(Location location, Type type, JsonSerializationContext jsonSerializationContext) {
-
         JsonObject object = new JsonObject();
+      try {
         object.add("x", new JsonPrimitive(location.getX()));
         object.add("y", new JsonPrimitive(location.getY()));
         object.add("z", new JsonPrimitive(location.getZ()));
         object.add("world", new JsonPrimitive(location.getWorld().toString()));
         return object;
+      } catch (Exception ex) {
+        ex.printStackTrace();
+        SavageFactions.plugin.log(Level.WARNING, "Error encountered while serializing a Location.");
+        return object;
+      }
     }
 
 
     @Override
     public Location deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) {
         JsonObject object = jsonElement.getAsJsonObject();
+      try {
+
         return new Location(Bukkit.getWorld(object.get("world").getAsString()),
                 object.get("x").getAsDouble(),
                 object.get("y").getAsDouble(),
                 object.get("z").getAsDouble());
+      } catch (Exception ex) {
+        ex.printStackTrace();
+        SavageFactions.plugin.log(Level.WARNING, "Error encountered while" +
+                " deserializing a Location.");
+        return null;
+      }
+
 
     }