diff --git a/src/com/bukkit/mcteam/factions/Faction.java b/src/com/bukkit/mcteam/factions/Faction.java
index d926a60d..ae0c4f54 100644
--- a/src/com/bukkit/mcteam/factions/Faction.java
+++ b/src/com/bukkit/mcteam/factions/Faction.java
@@ -332,7 +332,11 @@ public class Faction {
 		try {
 			DiscUtil.write(file, Factions.gson.toJson(instances));
 		} catch (IOException e) {
-			Factions.log("Failed to save the factions to disk.");
+			Factions.log("Failed to save the factions to disk due to I/O exception.");
+			e.printStackTrace();
+			return false;
+		} catch (NullPointerException e) {
+			Factions.log("Failed to save the factions to disk due to NPE.");
 			e.printStackTrace();
 			return false;
 		}
diff --git a/src/com/bukkit/mcteam/factions/MyLocationTypeAdapter.java b/src/com/bukkit/mcteam/factions/MyLocationTypeAdapter.java
index 39813778..8e349171 100644
--- a/src/com/bukkit/mcteam/factions/MyLocationTypeAdapter.java
+++ b/src/com/bukkit/mcteam/factions/MyLocationTypeAdapter.java
@@ -38,7 +38,18 @@ public class MyLocationTypeAdapter implements JsonDeserializer<Location>, JsonSe
 	@Override
 	public JsonElement serialize(Location src, Type typeOfSrc, JsonSerializationContext context) {
 		JsonObject obj = new JsonObject();
-		
+
+		if (src == null)
+		{
+			Factions.log("Passed location is null in MyLocationTypeAdapter.");
+			return obj;
+		}
+		else if (src.getWorld() == null)
+		{
+			Factions.log("Passed location's world is null in MyLocationTypeAdapter.");
+			return obj;
+		}
+
 		obj.addProperty(WORLD, src.getWorld().getName());
 		obj.addProperty(X, src.getX());
 		obj.addProperty(Y, src.getY());