diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java b/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java
index 257509d4f..1e0937e6f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java
@@ -42,11 +42,6 @@ public class Commandpotion extends EssentialsCommand
 			}
 			throw new NotEnoughArgumentsException(_("potions", Util.joinList(potionslist.toArray())));
 		}
-		
-		if (args.length < 3)
-		{
-			throw new NotEnoughArgumentsException();
-		}
 
 		if (stack.getType() == Material.POTION)
 		{
@@ -60,11 +55,15 @@ public class Commandpotion extends EssentialsCommand
 				}
 				else if (args[0].equalsIgnoreCase("apply") && user.isAuthorized("essentials.potion.apply"))
 				{
-					for(PotionEffect effect : pmeta.getCustomEffects())
+					for (PotionEffect effect : pmeta.getCustomEffects())
 					{
 						effect.apply(user);
 					}
 				}
+				else if (args.length < 3)
+				{
+					throw new NotEnoughArgumentsException();
+				}
 				else
 				{
 					final MetaItemStack mStack = new MetaItemStack(stack);