diff --git a/Essentials/src/main/java/com/earth2me/essentials/UserData.java b/Essentials/src/main/java/com/earth2me/essentials/UserData.java index fbac73390..a215d2002 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/UserData.java +++ b/Essentials/src/main/java/com/earth2me/essentials/UserData.java @@ -155,7 +155,8 @@ public abstract class UserData extends PlayerExtension implements IConf { public Location getHome(final String name) throws Exception { final String search = getHomeName(name); - return holder.homes().get(search).location(); + final LazyLocation loc = holder.homes().get(search); + return loc != null ? loc.location() : null; } public Location getHome(final Location world) {