diff --git a/src/com/massivecraft/factions/cmd/CmdList.java b/src/com/massivecraft/factions/cmd/CmdList.java
index edcd1f27..103c4a83 100644
--- a/src/com/massivecraft/factions/cmd/CmdList.java
+++ b/src/com/massivecraft/factions/cmd/CmdList.java
@@ -96,6 +96,10 @@ public class CmdList extends FCommand
 		final int pageheight = 9;
 		int pagenumber = this.argAsInt(0, 1);
 		int pagecount = (factionList.size() / pageheight) + 1;
+		if (pagenumber > pagecount)
+			pagenumber = pagecount;
+		else if (pagenumber < 1)
+			pagenumber = 1;
 		int start = (pagenumber - 1) * pageheight;
 		int end = start + pageheight;
 		if (end > factionList.size())