diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java
index 45e9a34e3..251e92646 100644
--- a/Essentials/src/com/earth2me/essentials/Teleport.java
+++ b/Essentials/src/com/earth2me/essentials/Teleport.java
@@ -3,6 +3,7 @@ package com.earth2me.essentials;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.utils.DateUtil;
 import com.earth2me.essentials.utils.LocationUtil;
+import java.math.BigDecimal;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import net.ess3.api.IEssentials;
@@ -171,8 +172,8 @@ public class Teleport implements net.ess3.api.ITeleport
 	{
 		double delay = ess.getSettings().getTeleportDelay();
 
-		Trade cashCharge = null;
-		if (chargeFor != null)
+		Trade cashCharge = chargeFor;
+		if (chargeFor != null && !chargeFor.getCommandCost(teleportOwner).equals(BigDecimal.ZERO))
 		{
 			chargeFor.isAffordableFor(teleportOwner);
 			cashCharge = new Trade(chargeFor.getCommandCost(teleportOwner), ess);
diff --git a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
index b6af79698..78e8d33bf 100644
--- a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
+++ b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
@@ -7,6 +7,7 @@ import java.math.BigDecimal;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
+import java.util.logging.Level;
 import net.ess3.api.IEssentials;
 import net.ess3.api.MaxMoneyException;
 import net.ess3.api.events.SignBreakEvent;
@@ -600,7 +601,7 @@ public class EssentialsSign
 			return builder.toString();
 			//return event.getLine(index); // Above code can be removed and replaced with this line when https://github.com/Bukkit/Bukkit/pull/982 is merged.
 		}
-		
+
 		@Override
 		public final void setLine(final int index, final String text)
 		{