diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java b/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java
index 10e8f31ab..c105e2e41 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhelp.java
@@ -54,13 +54,20 @@ public class Commandhelp extends EssentialsCommand
 		}
 
 		List<String> lines = getHelpLines(user, match);
-		int start = (page - 1) * 9;
-		int pages = lines.size() / 9 + (lines.size() % 9 > 0 ? 1 : 0);
-
-		user.sendMessage(Util.format("helpPages", page, pages));
-		for (int i = start; i < lines.size() && i < start + 9; i++)
+		if (lines.size() > 0)
 		{
-			user.sendMessage(lines.get(i));
+			int start = (page - 1) * 9;
+			int pages = lines.size() / 9 + (lines.size() % 9 > 0 ? 1 : 0);
+
+			user.sendMessage(Util.format("helpPages", page, pages));
+			for (int i = start; i < lines.size() && i < start + 9; i++)
+			{
+				user.sendMessage(lines.get(i));
+			}
+		}
+		else
+		{
+			user.sendMessage(Util.i18n("noHelpFound"));
 		}
 	}
 
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index b8d479a78..d65e6fd7f 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -182,6 +182,7 @@ nickSet = \u00a77Your nickname is now \u00a7c{0}
 noAccessCommand = \u00a7cYou do not have access to that command.
 noAccessPermission = \u00a7cYou do not have permission to access that {0}.
 noDestroyPermission = \u00a7cYou do not have permission to destroy that {0}.
+noHelpFound = \u00a7cNo matching commands.
 noHomeSet = You have not set a home.
 noHomeSetPlayer = Player has not set a home.
 noKitPermission = \u00a7cYou need the \u00a7c{0}\u00a7c permission to use that kit.
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml
index d3113a636..26bcf5806 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -30,7 +30,7 @@ commands:
   balancetop:
     description: Gets the top x balance values. (max 10)
     usage: /<command> <max>
-    aliases: 
+    aliases: [baltop,ebaltop,ebalancetop]
   ban:
     description: Bans a player.
     usage: /<command> [player] <reason>
@@ -58,6 +58,7 @@ commands:
   compass:
     description: Describes your current bearing.
     usage: /<command>
+    aliases: [ecompass]
   deljail:
     description: Removes a jail
     usage: /<command> [jailname]
@@ -80,7 +81,7 @@ commands:
   ext:
     description: Extinguish players.
     usage: /<command> <player>
-    aliases: [extinguish]
+    aliases: [extinguish,eext,eextinguish]
   fireball:
     description: Throw a fireball.
     usage: /<command>
@@ -162,6 +163,7 @@ commands:
   lightning:
     description: The power of Thor. Strike at cursor or player.
     usage: /<command> [player]
+    aliases: [strike,elightning,estrike]
   mail:
     description: Manages inter-player, intra-server mail.
     usage: /<command> [read|clear|send [to] [message]]
@@ -205,7 +207,7 @@ commands:
   r:
     description: Quickly reply to the last player to message you.
     usage: /<command> [message]
-    aliases: [er]
+    aliases: [er,reply,ereply]
   realname:
     description: Displays the username of a user based on nickname.
     usage: /<command> [nickname]