diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index d1ea3691180f0d11d6522157327451bee5fec9da..0aa2c9cf4fad1c240a97a0d3b700ac334e692dd7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -87,7 +87,6 @@ public class AdminAdmin implements IAdminCommandHandler
 	@Override
 	public boolean useAdminCommand(String command, L2PcInstance activeChar)
 	{
-		
 		if (command.startsWith("admin_admin"))
 		{
 			showMainPage(activeChar, command);
@@ -137,22 +136,18 @@ public class AdminAdmin implements IAdminCommandHandler
 			{
 				_log.warning("An error occured while ending olympiad: " + e);
 			}
-			activeChar.sendMessage("Heroes formed");
+			activeChar.sendMessage("Heroes formed.");
 		}
 		else if (command.startsWith("admin_manualhero") || command.startsWith("admin_sethero"))
 		{
-			L2PcInstance target = null;
-			
-			if (activeChar.getTarget().isPlayer())
+			if (activeChar.getTarget() == null)
 			{
-				target = activeChar.getTarget().getActingPlayer();
-				target.setHero(target.isHero() ? false : true);
-			}
-			else
-			{
-				target = activeChar;
-				target.setHero(target.isHero() ? false : true);
+				activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
+				return false;
 			}
+			
+			final L2PcInstance target = activeChar.getTarget().isPlayer() ?  activeChar.getTarget().getActingPlayer() : activeChar;
+			target.setHero(!target.isHero());
 			target.broadcastUserInfo();
 		}
 		else if (command.startsWith("admin_diet"))