diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 2009bacaff..fd357fd194 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -79,16 +79,18 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public void useAdminCommand(PlayerInstance player, String fullCommand, boolean useConfirm)
 	{
+		if (!player.isGM())
+		{
+			return;
+		}
+		
 		final String command = fullCommand.split(" ")[0];
 		final String commandNoPrefix = command.substring(6);
 		
 		final IAdminCommandHandler handler = getHandler(command);
 		if (handler == null)
 		{
-			if (player.isGM())
-			{
-				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
-			}
+			player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
 			LOGGER.warning("No handler registered for admin command '" + command + "'");
 			return;
 		}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 2009bacaff..fd357fd194 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -79,16 +79,18 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public void useAdminCommand(PlayerInstance player, String fullCommand, boolean useConfirm)
 	{
+		if (!player.isGM())
+		{
+			return;
+		}
+		
 		final String command = fullCommand.split(" ")[0];
 		final String commandNoPrefix = command.substring(6);
 		
 		final IAdminCommandHandler handler = getHandler(command);
 		if (handler == null)
 		{
-			if (player.isGM())
-			{
-				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
-			}
+			player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
 			LOGGER.warning("No handler registered for admin command '" + command + "'");
 			return;
 		}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 2009bacaff..fd357fd194 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -79,16 +79,18 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public void useAdminCommand(PlayerInstance player, String fullCommand, boolean useConfirm)
 	{
+		if (!player.isGM())
+		{
+			return;
+		}
+		
 		final String command = fullCommand.split(" ")[0];
 		final String commandNoPrefix = command.substring(6);
 		
 		final IAdminCommandHandler handler = getHandler(command);
 		if (handler == null)
 		{
-			if (player.isGM())
-			{
-				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
-			}
+			player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
 			LOGGER.warning("No handler registered for admin command '" + command + "'");
 			return;
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 2009bacaff..fd357fd194 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -79,16 +79,18 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public void useAdminCommand(PlayerInstance player, String fullCommand, boolean useConfirm)
 	{
+		if (!player.isGM())
+		{
+			return;
+		}
+		
 		final String command = fullCommand.split(" ")[0];
 		final String commandNoPrefix = command.substring(6);
 		
 		final IAdminCommandHandler handler = getHandler(command);
 		if (handler == null)
 		{
-			if (player.isGM())
-			{
-				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
-			}
+			player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
 			LOGGER.warning("No handler registered for admin command '" + command + "'");
 			return;
 		}
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 2009bacaff..fd357fd194 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -79,16 +79,18 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public void useAdminCommand(PlayerInstance player, String fullCommand, boolean useConfirm)
 	{
+		if (!player.isGM())
+		{
+			return;
+		}
+		
 		final String command = fullCommand.split(" ")[0];
 		final String commandNoPrefix = command.substring(6);
 		
 		final IAdminCommandHandler handler = getHandler(command);
 		if (handler == null)
 		{
-			if (player.isGM())
-			{
-				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
-			}
+			player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
 			LOGGER.warning("No handler registered for admin command '" + command + "'");
 			return;
 		}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 2009bacaff..fd357fd194 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -79,16 +79,18 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public void useAdminCommand(PlayerInstance player, String fullCommand, boolean useConfirm)
 	{
+		if (!player.isGM())
+		{
+			return;
+		}
+		
 		final String command = fullCommand.split(" ")[0];
 		final String commandNoPrefix = command.substring(6);
 		
 		final IAdminCommandHandler handler = getHandler(command);
 		if (handler == null)
 		{
-			if (player.isGM())
-			{
-				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
-			}
+			player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
 			LOGGER.warning("No handler registered for admin command '" + command + "'");
 			return;
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 2009bacaff..fd357fd194 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -79,16 +79,18 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public void useAdminCommand(PlayerInstance player, String fullCommand, boolean useConfirm)
 	{
+		if (!player.isGM())
+		{
+			return;
+		}
+		
 		final String command = fullCommand.split(" ")[0];
 		final String commandNoPrefix = command.substring(6);
 		
 		final IAdminCommandHandler handler = getHandler(command);
 		if (handler == null)
 		{
-			if (player.isGM())
-			{
-				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
-			}
+			player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
 			LOGGER.warning("No handler registered for admin command '" + command + "'");
 			return;
 		}
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index be8866ddfb..6653c4427d 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -74,9 +74,12 @@ public final class RequestBypassToServer extends GameClientPacket
 		{
 			if (_command.startsWith("admin_"))
 			{
-				// DaDummy: this way we LOGGER _every_ admincommand with all related info
-				String command;
+				if (!player.isGM())
+				{
+					return;
+				}
 				
+				String command;
 				if (_command.contains(" "))
 				{
 					command = _command.substring(0, _command.indexOf(" "));
@@ -87,14 +90,9 @@ public final class RequestBypassToServer extends GameClientPacket
 				}
 				
 				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getAdminCommandHandler(command);
-				
 				if (ach == null)
 				{
-					if (player.isGM())
-					{
-						player.sendMessage("The command " + command + " does not exists!");
-					}
-					
+					player.sendMessage("The command " + command + " does not exists!");
 					LOGGER.warning("No handler registered for admin command '" + command + "'");
 					return;
 				}
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
index 425a76e617..cfe8f4c9f1 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
@@ -46,7 +46,7 @@ public final class SendBypassBuildCmd extends GameClientPacket
 	protected void runImpl()
 	{
 		final PlayerInstance player = getClient().getPlayer();
-		if (player == null)
+		if ((player == null) || !player.isGM())
 		{
 			return;
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 91cb734847..346705bb1b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -79,16 +79,18 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public void useAdminCommand(PlayerInstance player, String fullCommand, boolean useConfirm)
 	{
+		if (!player.isGM())
+		{
+			return;
+		}
+		
 		final String command = fullCommand.split(" ")[0];
 		final String commandNoPrefix = command.substring(6);
 		
 		final IAdminCommandHandler handler = getHandler(command);
 		if (handler == null)
 		{
-			if (player.isGM())
-			{
-				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
-			}
+			player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
 			LOGGER.warning("No handler registered for admin command '" + command + "'");
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 2009bacaff..fd357fd194 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -79,16 +79,18 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public void useAdminCommand(PlayerInstance player, String fullCommand, boolean useConfirm)
 	{
+		if (!player.isGM())
+		{
+			return;
+		}
+		
 		final String command = fullCommand.split(" ")[0];
 		final String commandNoPrefix = command.substring(6);
 		
 		final IAdminCommandHandler handler = getHandler(command);
 		if (handler == null)
 		{
-			if (player.isGM())
-			{
-				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
-			}
+			player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
 			LOGGER.warning("No handler registered for admin command '" + command + "'");
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 2009bacaff..fd357fd194 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -79,16 +79,18 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public void useAdminCommand(PlayerInstance player, String fullCommand, boolean useConfirm)
 	{
+		if (!player.isGM())
+		{
+			return;
+		}
+		
 		final String command = fullCommand.split(" ")[0];
 		final String commandNoPrefix = command.substring(6);
 		
 		final IAdminCommandHandler handler = getHandler(command);
 		if (handler == null)
 		{
-			if (player.isGM())
-			{
-				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
-			}
+			player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
 			LOGGER.warning("No handler registered for admin command '" + command + "'");
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 2009bacaff..fd357fd194 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -79,16 +79,18 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public void useAdminCommand(PlayerInstance player, String fullCommand, boolean useConfirm)
 	{
+		if (!player.isGM())
+		{
+			return;
+		}
+		
 		final String command = fullCommand.split(" ")[0];
 		final String commandNoPrefix = command.substring(6);
 		
 		final IAdminCommandHandler handler = getHandler(command);
 		if (handler == null)
 		{
-			if (player.isGM())
-			{
-				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
-			}
+			player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
 			LOGGER.warning("No handler registered for admin command '" + command + "'");
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 2009bacaff..fd357fd194 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -79,16 +79,18 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public void useAdminCommand(PlayerInstance player, String fullCommand, boolean useConfirm)
 	{
+		if (!player.isGM())
+		{
+			return;
+		}
+		
 		final String command = fullCommand.split(" ")[0];
 		final String commandNoPrefix = command.substring(6);
 		
 		final IAdminCommandHandler handler = getHandler(command);
 		if (handler == null)
 		{
-			if (player.isGM())
-			{
-				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
-			}
+			player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
 			LOGGER.warning("No handler registered for admin command '" + command + "'");
 			return;
 		}