diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index edda44bde2..cd48901009 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
 		}
 		else if (command.startsWith("admin_untransform"))
 		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
+			final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
+			if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
 			{
 				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
 			}
+			
+			((L2Character) obj).stopTransformation(true);
 		}
 		else if (command.startsWith("admin_transform"))
 		{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index edda44bde2..cd48901009 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
 		}
 		else if (command.startsWith("admin_untransform"))
 		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
+			final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
+			if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
 			{
 				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
 			}
+			
+			((L2Character) obj).stopTransformation(true);
 		}
 		else if (command.startsWith("admin_transform"))
 		{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index edda44bde2..cd48901009 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
 		}
 		else if (command.startsWith("admin_untransform"))
 		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
+			final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
+			if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
 			{
 				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
 			}
+			
+			((L2Character) obj).stopTransformation(true);
 		}
 		else if (command.startsWith("admin_transform"))
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index edda44bde2..cd48901009 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
 		}
 		else if (command.startsWith("admin_untransform"))
 		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
+			final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
+			if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
 			{
 				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
 			}
+			
+			((L2Character) obj).stopTransformation(true);
 		}
 		else if (command.startsWith("admin_transform"))
 		{
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index edda44bde2..cd48901009 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
 		}
 		else if (command.startsWith("admin_untransform"))
 		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
+			final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
+			if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
 			{
 				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
 			}
+			
+			((L2Character) obj).stopTransformation(true);
 		}
 		else if (command.startsWith("admin_transform"))
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index edda44bde2..cd48901009 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
 		}
 		else if (command.startsWith("admin_untransform"))
 		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
+			final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
+			if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
 			{
 				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
 			}
+			
+			((L2Character) obj).stopTransformation(true);
 		}
 		else if (command.startsWith("admin_transform"))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index 1943eb7fc5..24994ca656 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -47,15 +47,14 @@ public class AdminTransform implements IAdminCommandHandler
 		}
 		else if (command.startsWith("admin_untransform"))
 		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
+			final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
+			if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
 			{
 				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
 			}
+			
+			((L2Character) obj).stopTransformation(true);
 		}
 		else if (command.startsWith("admin_transform"))
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index edda44bde2..cd48901009 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
 		}
 		else if (command.startsWith("admin_untransform"))
 		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
+			final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
+			if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
 			{
 				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
 			}
+			
+			((L2Character) obj).stopTransformation(true);
 		}
 		else if (command.startsWith("admin_transform"))
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index edda44bde2..cd48901009 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
 		}
 		else if (command.startsWith("admin_untransform"))
 		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
+			final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
+			if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
 			{
 				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
 			}
+			
+			((L2Character) obj).stopTransformation(true);
 		}
 		else if (command.startsWith("admin_transform"))
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index edda44bde2..cd48901009 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
 		}
 		else if (command.startsWith("admin_untransform"))
 		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
+			final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
+			if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
 			{
 				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
 			}
+			
+			((L2Character) obj).stopTransformation(true);
 		}
 		else if (command.startsWith("admin_transform"))
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
index edda44bde2..cd48901009 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java
@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
 		}
 		else if (command.startsWith("admin_untransform"))
 		{
-			final L2Object obj = activeChar.getTarget();
-			if (obj.isCharacter())
-			{
-				((L2Character) obj).stopTransformation(true);
-			}
-			else
+			final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
+			if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
 			{
 				activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
+				return false;
 			}
+			
+			((L2Character) obj).stopTransformation(true);
 		}
 		else if (command.startsWith("admin_transform"))
 		{