diff --git a/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs b/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs
index 32c7f88d15a..e75da1bf7c7 100644
--- a/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs
+++ b/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs
@@ -794,7 +794,8 @@ private IQueryable ResolveEntityJoinReferencedPersister(IASTNode path)
 			if (path.Type == IDENT)
 			{
 				var pathIdentNode = (IdentNode) path;
-				return SessionFactoryHelper.FindQueryableUsingImports(pathIdentNode.Path);
+				// Since IDENT node is not expected for implicit join path, we can throw on not found persister
+				return (IQueryable) SessionFactoryHelper.RequireClassPersister(pathIdentNode.Path);
 			}
 			else if (path.Type == DOT)
 			{