diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
index f556ea360..fbcaa555d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
@@ -58,5 +58,6 @@ public class Commandhome extends EssentialsCommand
 				user.sendMessage(Util.format("homes", Util.joinList(homes)));
 			}
 		}
+		throw new NoChargeException();
 	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
index 0a315b1d4..77db8e5e3 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
@@ -47,7 +47,7 @@ public class Commandworld extends EssentialsCommand
 				user.sendMessage(Util.i18n("invalidWorld"));
 				user.sendMessage(Util.format("possibleWorlds", server.getWorlds().size() - 1));
 				user.sendMessage(Util.i18n("typeWorldName"));
-				return;
+				throw new NoChargeException();
 			}
 		}
 
@@ -71,5 +71,6 @@ public class Commandworld extends EssentialsCommand
 		Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);
 		user.getTeleport().teleport(loc, charge);
+		throw new NoChargeException();
 	}
 }