diff --git a/src/main/java/com/laytonsmith/core/functions/EntityManagement.java b/src/main/java/com/laytonsmith/core/functions/EntityManagement.java
index badbfe92a..6053fb9be 100644
--- a/src/main/java/com/laytonsmith/core/functions/EntityManagement.java
+++ b/src/main/java/com/laytonsmith/core/functions/EntityManagement.java
@@ -4591,13 +4591,18 @@ public Version since() {
 	}
 
 	@api(environments = {CommandHelperEnvironment.class})
-	public static class has_scoreboard_tag extends EntityGetterFunction {
+	public static class has_scoreboard_tag extends AbstractFunction {
 
 		@Override
 		public String getName() {
 			return "has_scoreboard_tag";
 		}
 
+		@Override
+		public Integer[] numArgs() {
+			return new Integer[]{2};
+		}
+
 		@Override
 		public String docs() {
 			return "boolean {entityUUID, tag} Returns whether this entity has a specific tag.";
@@ -4609,6 +4614,21 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 			return CBoolean.get(e.hasScoreboardTag(args[1].val()));
 		}
 
+		@Override
+		public Class<? extends CREThrowable>[] thrown() {
+			return new Class[]{CREBadEntityException.class, CRELengthException.class, CREFormatException.class};
+		}
+
+		@Override
+		public boolean isRestricted() {
+			return true;
+		}
+
+		@Override
+		public Boolean runAsync() {
+			return false;
+		}
+
 		@Override
 		public Version since() {
 			return MSVersion.V3_3_5;