diff --git a/Essentials/src/main/java/com/earth2me/essentials/UserData.java b/Essentials/src/main/java/com/earth2me/essentials/UserData.java
index a215d2002..cff268a91 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/UserData.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/UserData.java
@@ -153,7 +153,7 @@ public abstract class UserData extends PlayerExtension implements IConf {
         return search;
     }
 
-    public Location getHome(final String name) throws Exception {
+    public Location getHome(final String name) {
         final String search = getHomeName(name);
         final LazyLocation loc = holder.homes().get(search);
         return loc != null ? loc.location() : null;
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhome.java
index cdff5774f..01f83c3bc 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhome.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhome.java
@@ -81,7 +81,7 @@ public class Commandhome extends EssentialsCommand {
                     } else {
                         showError(user.getBase(), new Exception(tl("noHomeSetPlayer")), commandLabel);
                     }
-                } else if (homes.isEmpty()) {
+                } else if (homes.isEmpty() || finalPlayer.getHome(homes.get(0)) == null) {
                     showError(user.getBase(), new Exception(tl("noHomeSetPlayer")), commandLabel);
                 } else if (homes.size() == 1 && finalPlayer.equals(user)) {
                     try {