diff --git a/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/FilterQueryResolverDelegate.java b/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/FilterQueryResolverDelegate.java
index fa31efdc02ca..646936f1b430 100644
--- a/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/FilterQueryResolverDelegate.java
+++ b/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/FilterQueryResolverDelegate.java
@@ -58,7 +58,7 @@ public void registerPersisterSpace(Tree entityNameTree, Tree aliasTree) {
       targetType = entityName;
       Class<?> targetClass = propertyHelper.getEntityNamesResolver().getClassFromName(entityName);
       if (targetClass == null) {
-         throw new IllegalStateException("Unknown entity name " + entityName);
+         throw log.getUnknownEntity(entityName);
       }
    }
 
@@ -122,7 +122,7 @@ public PathedPropertyReferenceSource normalizeQualifiedRoot(Tree root) {
       }
 
       if (propertyHelper.getEntityNamesResolver().getClassFromName(entityNameForAlias) == null) {
-         throw new IllegalStateException("Unknown entity name " + entityNameForAlias);
+         throw log.getUnknownEntity(entityNameForAlias);
       }
 
       return new PathedPropertyReference(alias, new FilterEntityTypeDescriptor(entityNameForAlias, propertyHelper), true);
diff --git a/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/ProtobufPropertyHelper.java b/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/ProtobufPropertyHelper.java
index a89b2c66f8e2..df41cffa642d 100644
--- a/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/ProtobufPropertyHelper.java
+++ b/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/ProtobufPropertyHelper.java
@@ -67,7 +67,7 @@ private FieldDescriptor getField(String entityType, String[] propertyPath) {
       try {
          messageDescriptor = serializationContext.getMessageDescriptor(entityType);
       } catch (Exception e) {
-         throw new IllegalStateException("Unknown entity name " + entityType);
+         throw log.getUnknownEntity(entityType);
       }
 
       int i = 0;
@@ -91,7 +91,7 @@ public boolean hasProperty(String entityType, String[] propertyPath) {
       try {
          messageDescriptor = serializationContext.getMessageDescriptor(entityType);
       } catch (Exception e) {
-         throw new IllegalStateException("Unknown entity name " + entityType);
+         throw log.getUnknownEntity(entityType);
       }
 
       int i = 0;
@@ -116,7 +116,7 @@ public boolean hasEmbeddedProperty(String entityType, String[] propertyPath) {
       try {
          messageDescriptor = serializationContext.getMessageDescriptor(entityType);
       } catch (Exception e) {
-         throw new IllegalStateException("Unknown entity name " + entityType);
+         throw log.getUnknownEntity(entityType);
       }
 
       for (String p : propertyPath) {
@@ -139,7 +139,7 @@ public boolean isRepeatedProperty(String entityType, String[] propertyPath) {
       try {
          messageDescriptor = serializationContext.getMessageDescriptor(entityType);
       } catch (Exception e) {
-         throw new IllegalStateException("Unknown entity name " + entityType);
+         throw log.getUnknownEntity(entityType);
       }
 
       for (String p : propertyPath) {
diff --git a/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/ReflectionPropertyHelper.java b/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/ReflectionPropertyHelper.java
index d2f8862d28a1..5bc9e43c84f5 100644
--- a/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/ReflectionPropertyHelper.java
+++ b/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/ReflectionPropertyHelper.java
@@ -1,7 +1,9 @@
 package org.infinispan.objectfilter.impl.hql;
 
 import org.hibernate.hql.ast.spi.EntityNamesResolver;
+import org.infinispan.objectfilter.impl.logging.Log;
 import org.infinispan.objectfilter.impl.util.ReflectionHelper;
+import org.jboss.logging.Logger;
 
 import java.beans.IntrospectionException;
 
@@ -11,6 +13,8 @@
  */
 public final class ReflectionPropertyHelper extends ObjectPropertyHelper<Class<?>> {
 
+   private static final Log log = Logger.getMessageLogger(Log.class, ReflectionPropertyHelper.class.getName());
+
    public ReflectionPropertyHelper(EntityNamesResolver entityNamesResolver) {
       super(entityNamesResolver);
    }
@@ -24,7 +28,7 @@ public Class<?> getEntityMetadata(String targetTypeName) {
    public Class<?> getPrimitivePropertyType(String entityType, String[] propertyPath) {
       Class<?> type = entityNamesResolver.getClassFromName(entityType);
       if (type == null) {
-         throw new IllegalStateException("Unknown entity name " + entityType);
+         throw log.getUnknownEntity(entityType);
       }
 
       try {
@@ -45,7 +49,7 @@ public Class<?> getPrimitivePropertyType(String entityType, String[] propertyPat
    public boolean hasEmbeddedProperty(String entityType, String[] propertyPath) {
       Class<?> entity = entityNamesResolver.getClassFromName(entityType);
       if (entity == null) {
-         throw new IllegalStateException("Unknown entity name " + entityType);
+         throw log.getUnknownEntity(entityType);
       }
 
       try {
@@ -60,7 +64,7 @@ public boolean hasEmbeddedProperty(String entityType, String[] propertyPath) {
    public boolean isRepeatedProperty(String entityType, String[] propertyPath) {
       Class<?> entity = entityNamesResolver.getClassFromName(entityType);
       if (entity == null) {
-         throw new IllegalStateException("Unknown entity name " + entityType);
+         throw log.getUnknownEntity(entityType);
       }
       try {
          ReflectionHelper.PropertyAccessor a = ReflectionHelper.getAccessor(entity, propertyPath[0]);
@@ -83,7 +87,7 @@ public boolean isRepeatedProperty(String entityType, String[] propertyPath) {
    public boolean hasProperty(String entityType, String[] propertyPath) {
       Class<?> entity = entityNamesResolver.getClassFromName(entityType);
       if (entity == null) {
-         throw new IllegalStateException("Unknown entity name " + entityType);
+         throw log.getUnknownEntity(entityType);
       }
 
       try {
diff --git a/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/predicate/FilterPredicateFactory.java b/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/predicate/FilterPredicateFactory.java
index bff005929262..89f40f75320b 100644
--- a/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/predicate/FilterPredicateFactory.java
+++ b/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/predicate/FilterPredicateFactory.java
@@ -12,9 +12,11 @@
 import org.hibernate.hql.ast.spi.predicate.RangePredicate;
 import org.hibernate.hql.ast.spi.predicate.RootPredicate;
 import org.infinispan.objectfilter.impl.hql.ObjectPropertyHelper;
+import org.infinispan.objectfilter.impl.logging.Log;
 import org.infinispan.objectfilter.impl.syntax.BooleanExpr;
 import org.infinispan.objectfilter.impl.syntax.PropertyValueExpr;
 import org.infinispan.objectfilter.impl.syntax.ValueExpr;
+import org.jboss.logging.Logger;
 
 import java.util.List;
 
@@ -24,6 +26,8 @@
  */
 public final class FilterPredicateFactory implements PredicateFactory<BooleanExpr> {
 
+   private static final Log log = Logger.getMessageLogger(Log.class, FilterPredicateFactory.class.getName());
+
    private final ObjectPropertyHelper propertyHelper;
 
    public FilterPredicateFactory(ObjectPropertyHelper propertyHelper) {
@@ -33,7 +37,7 @@ public FilterPredicateFactory(ObjectPropertyHelper propertyHelper) {
    @Override
    public RootPredicate<BooleanExpr> getRootPredicate(String entityType) {
       if (propertyHelper.getEntityNamesResolver().getClassFromName(entityType) == null) {
-         throw new IllegalStateException("Unknown entity name " + entityType);
+         throw log.getUnknownEntity(entityType);
       }
       return new FilterRootPredicate();
    }
diff --git a/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/predicate/SingleEntityHavingQueryBuilderImpl.java b/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/predicate/SingleEntityHavingQueryBuilderImpl.java
index 61b439890ddc..ab5f36ccfddc 100644
--- a/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/predicate/SingleEntityHavingQueryBuilderImpl.java
+++ b/object-filter/src/main/java/org/infinispan/objectfilter/impl/hql/predicate/SingleEntityHavingQueryBuilderImpl.java
@@ -9,9 +9,11 @@
 import org.hibernate.hql.ast.spi.predicate.RootPredicate;
 import org.infinispan.objectfilter.PropertyPath;
 import org.infinispan.objectfilter.impl.hql.ObjectPropertyHelper;
+import org.infinispan.objectfilter.impl.logging.Log;
 import org.infinispan.objectfilter.impl.syntax.AggregationExpr;
 import org.infinispan.objectfilter.impl.syntax.BooleanExpr;
 import org.infinispan.objectfilter.impl.syntax.PropertyValueExpr;
+import org.jboss.logging.Logger;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,6 +30,8 @@
  */
 public final class SingleEntityHavingQueryBuilderImpl implements SingleEntityHavingQueryBuilder<BooleanExpr> {
 
+   private static final Log log = Logger.getMessageLogger(Log.class, SingleEntityHavingQueryBuilderImpl.class.getName());
+
    private final EntityNamesResolver entityNamesResolver;
 
    private final ObjectPropertyHelper propertyHelper;
@@ -56,7 +60,7 @@ public SingleEntityHavingQueryBuilderImpl(EntityNamesResolver entityNamesResolve
    @Override
    public void setEntityType(String entityType) {
       if (entityNamesResolver.getClassFromName(entityType) == null) {
-         throw new IllegalStateException("Unknown entity name " + entityType);
+         throw log.getUnknownEntity(entityType);
       }
       this.entityType = entityType;
       rootPredicate = new FilterRootPredicate();
diff --git a/object-filter/src/main/java/org/infinispan/objectfilter/impl/logging/Log.java b/object-filter/src/main/java/org/infinispan/objectfilter/impl/logging/Log.java
index a4cf541bb2dc..7be492e267c7 100644
--- a/object-filter/src/main/java/org/infinispan/objectfilter/impl/logging/Log.java
+++ b/object-filter/src/main/java/org/infinispan/objectfilter/impl/logging/Log.java
@@ -40,4 +40,7 @@ public interface Log extends BasicLogger {
 
    @Message(id = 411, value = "Filters cannot use grouping or aggregations")
    ParsingException getFiltersCannotUseGroupingOrAggregationException();
+
+   @Message(id = 412, value = "Unknown entity name %s")
+   IllegalStateException getUnknownEntity(String entityType);
 }