diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
index 501aca36c..2c8f82673 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
@@ -71,10 +71,6 @@ public class Commandwarp extends EssentialsCommand
 	private void warpList(final CommandSource sender, final String[] args, final IUser user) throws Exception
 	{
 		final IWarps warps = ess.getWarps();
-		if (warps.isEmpty())
-		{
-			throw new Exception(_("noWarpsDefined"));
-		}
 		final List<String> warpNameList = new ArrayList<String>(warps.getList());
 
 		if (user != null)
@@ -89,6 +85,10 @@ public class Commandwarp extends EssentialsCommand
 				}
 			}
 		}
+		if (warpNameList.isEmpty())
+		{
+			throw new Exception(_("noWarpsDefined"));
+		}
 		int page = 1;
 		if (args.length > 0 && NumberUtil.isInt(args[0]))
 		{