diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
index 9cb3577ee..708e53586 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java
@@ -28,7 +28,7 @@ public class Commandrepair extends EssentialsCommand
 		if (args[0].equalsIgnoreCase("hand"))
 		{
 			final ItemStack item = user.getItemInHand();
-			if (item == null)
+			if (item == null || item.getType().isBlock() || item.getDurability() == 0)
 			{
 				throw new Exception(_("repairInvalidType"));
 			}