diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java
index 2469f6ec1..542299c13 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java
@@ -23,7 +23,7 @@ public class Commandsetwarp extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		if (Util.isInt(args[0]))
+		if (Util.isInt(args[0]) || args[0].isEmpty())
 		{
 			throw new NoSuchFieldException(_("invalidWarpName"));
 		}