diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
index 75910cd85..4e78b0e1b 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
@@ -36,6 +36,10 @@ public class Commandtppos extends EssentialsCommand
 		{
 			location.setPitch(Float.parseFloat(args[4]));
 		}
+		if (x > 30000000 ||  y > 30000000 || z > 30000000 || x < -30000000 || y < 30000000 || z < 30000000)
+		{
+			throw new NotEnoughArgumentsException("Value of coordinates cannot be over 30000000"); //todo: I18n
+		}
 		final Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);
 		user.sendMessage(_("teleporting"));
@@ -64,8 +68,13 @@ public class Commandtppos extends EssentialsCommand
 		{
 			location.setPitch(Float.parseFloat(args[5]));
 		}
+		if (x > 30000000 ||  y > 30000000 || z > 30000000 || x < -30000000 || y < 30000000 || z < 30000000)
+		{
+			throw new NotEnoughArgumentsException("Value of coordinates cannot be over 30000000"); //todo: I18n
+		}
 		sender.sendMessage(_("teleporting"));
 		user.sendMessage(_("teleporting"));
 		user.getTeleport().teleport(location, null, TeleportCause.COMMAND);
+		
 	}
 }
\ No newline at end of file