diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java
index 95ed5c205ac4..6c2deaf960c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java
@@ -75,23 +75,21 @@ public <P> ProcedureParameterBinding<P> getQueryParameterBinding(ProcedureParame
 	}
 
 	@Override
-	public <P> ProcedureParameterBinding<P> getBinding(String name) {
+	public ProcedureParameterBinding<?> getBinding(String name) {
 		final var parameter = parameterMetadata.getQueryParameter( name );
 		if ( parameter == null ) {
 			throw new IllegalArgumentException( "Parameter with name '" + name + "' does not exist" );
 		}
-		//noinspection unchecked
-		return getQueryParameterBinding( (ProcedureParameterImplementor<P>) parameter );
+		return getQueryParameterBinding( (ProcedureParameterImplementor<?>) parameter );
 	}
 
 	@Override
-	public <P> ProcedureParameterBinding<P> getBinding(int position) {
+	public ProcedureParameterBinding<?> getBinding(int position) {
 		final var parameter = parameterMetadata.getQueryParameter( position );
 		if ( parameter == null ) {
 			throw new IllegalArgumentException( "Parameter at position " + position + "does not exist" );
 		}
-		//noinspection unchecked
-		return getQueryParameterBinding( (ProcedureParameterImplementor<P>) parameter );
+		return getQueryParameterBinding( (ProcedureParameterImplementor<?>) parameter );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryArgumentException.java b/hibernate-core/src/main/java/org/hibernate/query/QueryArgumentException.java
index 828f3ac61e17..1b6705d39364 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/QueryArgumentException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/QueryArgumentException.java
@@ -15,11 +15,20 @@
  */
 public class QueryArgumentException extends IllegalArgumentException {
 	private final Class<?> parameterType;
+	private final Class<?> argumentType;
 	private final Object argument;
 
 	public QueryArgumentException(String message, Class<?> parameterType, Object argument) {
-		super(message);
+		super( message + " (argument [" + argument + "] is not assignable to " + parameterType.getName() + ")" );
 		this.parameterType = parameterType;
+		this.argumentType = argument == null ? null : argument.getClass();
+		this.argument = argument;
+	}
+
+	public QueryArgumentException(String message, Class<?> parameterType, Class<?> argumentType, Object argument) {
+		super( message + " (" + argumentType.getName() + " is not assignable to " + parameterType.getName() + ")" );
+		this.parameterType = parameterType;
+		this.argumentType = argumentType;
 		this.argument = argument;
 	}
 
@@ -27,6 +36,10 @@ public Class<?> getParameterType() {
 		return parameterType;
 	}
 
+	public Class<?> getArgumentType() {
+		return argumentType;
+	}
+
 	public Object getArgument() {
 		return argument;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryArguments.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryArguments.java
new file mode 100644
index 000000000000..872dbfe53959
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryArguments.java
@@ -0,0 +1,99 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.query.internal;
+
+import jakarta.persistence.metamodel.Type;
+import org.hibernate.HibernateException;
+import org.hibernate.type.BindingContext;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.java.spi.EntityJavaType;
+
+import java.util.Collection;
+
+import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
+
+/**
+ * @since 7.3
+ *
+ * @author Gavin King
+ */
+public class QueryArguments {
+
+	private static boolean isInstance(Object value, JavaType<?> javaType) {
+		try {
+			// special handling for entity arguments due to
+			// the possibility of an uninitialized proxy
+			// (which we don't want or need to fetch)
+			if ( javaType instanceof EntityJavaType<?> ) {
+				final var javaTypeClass = javaType.getJavaTypeClass();
+				final var initializer = extractLazyInitializer( value );
+				final var valueEntityClass =
+						initializer != null
+								? initializer.getPersistentClass()
+								: value.getClass();
+				// accept assignability in either direction
+				return javaTypeClass.isAssignableFrom( valueEntityClass )
+					|| valueEntityClass.isAssignableFrom( javaTypeClass );
+			}
+			else {
+				// require that the argument be assignable to the parameter
+				return javaType.isInstance( javaType.coerce( value ) );
+			}
+		}
+		catch (HibernateException ce) {
+			return false;
+		}
+	}
+
+	public static boolean isInstance(
+			Type<?> parameterType, Object value,
+			BindingContext bindingContext) {
+		if ( value == null ) {
+			return true;
+		}
+		final var sqmExpressible = bindingContext.resolveExpressible( parameterType );
+		assert sqmExpressible != null;
+		final var javaType = sqmExpressible.getExpressibleJavaType();
+		return isInstance( value, javaType );
+	}
+
+	public static boolean areInstances(
+			Type<?> parameterType, Collection<?> values,
+			BindingContext bindingContext) {
+		if ( values.isEmpty() ) {
+			return true;
+		}
+		final var sqmExpressible = bindingContext.resolveExpressible( parameterType );
+		assert sqmExpressible != null;
+		final var javaType = sqmExpressible.getExpressibleJavaType();
+		for ( Object value : values ) {
+			if ( !isInstance( value, javaType ) ) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public static boolean areInstances(
+			Type<?> parameterType, Object[] values,
+			BindingContext bindingContext) {
+		if ( values.length == 0 ) {
+			return true;
+		}
+		if ( parameterType.getJavaType()
+				.isAssignableFrom( values.getClass().getComponentType() ) ) {
+			return true;
+		}
+		final var sqmExpressible = bindingContext.resolveExpressible( parameterType );
+		assert sqmExpressible != null;
+		final var javaType = sqmExpressible.getExpressibleJavaType();
+		for ( Object value : values ) {
+			if ( !isInstance( value, javaType ) ) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
index 4c9bdd7d91b5..0acc3415c676 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
@@ -16,13 +16,13 @@
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.spi.QueryParameterBinding;
 import org.hibernate.query.spi.QueryParameterBindingTypeResolver;
-import org.hibernate.query.spi.QueryParameterBindingValidator;
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import jakarta.persistence.TemporalType;
 
+import static org.hibernate.query.spi.QueryParameterBindingValidator.validate;
 import static org.hibernate.type.descriptor.java.JavaTypeHelper.isTemporal;
 import static org.hibernate.type.internal.BindingTypeHelper.resolveTemporalPrecision;
 
@@ -116,7 +116,7 @@ public T getBindValue() {
 	public void setBindValue(T value, boolean resolveJdbcTypeIfNecessary) {
 		if ( !handleAsMultiValue( value, null ) ) {
 			final Object coerced = coerceIfNotJpa( value );
-			validate( coerced );
+			validate( getBindType(), coerced, sessionFactory );
 
 			if ( value == null ) {
 				// needed when setting a null value to the parameter of a native SQL query
@@ -174,7 +174,7 @@ public void setBindValue(T value, @Nullable BindableType<T> clarifiedType) {
 			}
 
 			final Object coerced = coerce( value );
-			validate( coerced, clarifiedType );
+			validate( clarifiedType, coerced, sessionFactory );
 			bindValue( coerced );
 		}
 	}
@@ -187,7 +187,7 @@ public void setBindValue(T value, TemporalType temporalTypePrecision) {
 			}
 
 			final Object coerced = coerceIfNotJpa( value );
-			validate( coerced, temporalTypePrecision );
+			validate( getBindType(), coerced, sessionFactory );
 			bindValue( coerced );
 			setExplicitTemporalPrecision( temporalTypePrecision );
 		}
@@ -218,15 +218,19 @@ public void setBindValues(Collection<? extends T> values) {
 		this.bindValue = null;
 		this.bindValues = values;
 
+		final T value = firstNonNull( values );
+		if ( canBindValueBeSet( value, bindType ) ) {
+			bindType = getParameterBindingTypeResolver().resolveParameterBindType( value );
+		}
+	}
+
+	private static <T> @Nullable T firstNonNull(Collection<? extends T> values) {
 		final var iterator = values.iterator();
 		T value = null;
 		while ( value == null && iterator.hasNext() ) {
 			value = iterator.next();
 		}
-
-		if ( canBindValueBeSet( value, bindType ) ) {
-			bindType = getParameterBindingTypeResolver().resolveParameterBindType( value );
-		}
+		return value;
 	}
 
 	@Override
@@ -284,18 +288,6 @@ else if ( type instanceof BasicValuedMapping basicValuedMapping ) {
 		return false;
 	}
 
-	private void validate(Object value) {
-		QueryParameterBindingValidator.INSTANCE.validate( getBindType(), value, getCriteriaBuilder() );
-	}
-
-	private void validate(Object value, BindableType<?> clarifiedType) {
-		QueryParameterBindingValidator.INSTANCE.validate( clarifiedType, value, getCriteriaBuilder() );
-	}
-
-	private void validate(Object value, TemporalType clarifiedTemporalType) {
-		QueryParameterBindingValidator.INSTANCE.validate( getBindType(), value, clarifiedTemporalType, getCriteriaBuilder() );
-	}
-
 	public TypeConfiguration getTypeConfiguration() {
 		return sessionFactory.getTypeConfiguration();
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java
index 281a0b5de19e..a7f63b73fa8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java
@@ -68,7 +68,8 @@ private QueryParameterBindingsImpl(
 		this.parameterBindingMap = linkedMapOfSize( queryParameters.size() );
 		this.parameterBindingMapByNameOrPosition = mapOfSize( queryParameters.size() );
 		for ( var queryParameter : queryParameters ) {
-			parameterBindingMap.put( queryParameter, createBinding( sessionFactory, parameterMetadata, queryParameter ) );
+			parameterBindingMap.put( queryParameter,
+					createBinding( sessionFactory, parameterMetadata, queryParameter ) );
 		}
 		for ( var entry : parameterBindingMap.entrySet() ) {
 			final var queryParameter = entry.getKey();
@@ -129,30 +130,32 @@ public <P> QueryParameterBinding<P> getBinding(QueryParameterImplementor<P> para
 					"Cannot create binding for parameter reference [" + parameter + "] - reference is not a parameter of this query"
 			);
 		}
-		//noinspection unchecked
-		return (QueryParameterBinding<P>) binding;
+		if ( !binding.getQueryParameter().equals( parameter ) ) {
+			throw new IllegalStateException("Parameter binding corrupted for: " + parameter.getName() );
+		}
+		@SuppressWarnings("unchecked") // safe because we checked the parameter
+		final var castBinding = (QueryParameterBinding<P>) binding;
+		return castBinding;
 	}
 
 	@Override
-	public <P> QueryParameterBinding<P> getBinding(int position) {
+	public QueryParameterBinding<?> getBinding(int position) {
 		final var binding = parameterBindingMapByNameOrPosition.get( position );
 		if ( binding == null ) {
 			// Invoke this method to throw the exception
 			parameterMetadata.getQueryParameter( position );
 		}
-		//noinspection unchecked
-		return (QueryParameterBinding<P>) binding;
+		return binding;
 	}
 
 	@Override
-	public <P> QueryParameterBinding<P> getBinding(String name) {
+	public QueryParameterBinding<?> getBinding(String name) {
 		final var binding = parameterBindingMapByNameOrPosition.get( name );
 		if ( binding == null ) {
 			// Invoke this method to throw the exception
 			parameterMetadata.getQueryParameter( name );
 		}
-		//noinspection unchecked
-		return (QueryParameterBinding<P>) binding;
+		return binding;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java
index b6678db8e43c..4817faa4374a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java
@@ -38,7 +38,6 @@
 import org.hibernate.query.criteria.JpaExpression;
 import org.hibernate.query.internal.QueryOptionsImpl;
 import org.hibernate.query.sqm.NodeBuilder;
-import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.tree.expression.SqmLiteral;
 import org.hibernate.query.sqm.tree.expression.SqmParameter;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
@@ -51,10 +50,12 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static java.util.Arrays.asList;
+import static java.lang.Math.round;
+import static java.util.Collections.unmodifiableSet;
 import static java.util.Locale.ROOT;
 import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER;
 import static org.hibernate.jpa.HibernateHints.HINT_CACHEABLE;
@@ -88,6 +89,8 @@
 import static org.hibernate.jpa.internal.util.ConfigurationHelper.getCacheMode;
 import static org.hibernate.jpa.internal.util.ConfigurationHelper.getInteger;
 import static org.hibernate.query.QueryLogging.QUERY_MESSAGE_LOGGER;
+import static org.hibernate.query.internal.QueryArguments.areInstances;
+import static org.hibernate.query.internal.QueryArguments.isInstance;
 
 /**
  * Base implementation of {@link CommonQueryContract}.
@@ -282,7 +285,7 @@ public final boolean applyHint(String hintName, Object value) {
 					//fall through:
 				case HINT_SPEC_QUERY_TIMEOUT:
 					// convert milliseconds to seconds
-					int timeout = (int) Math.round( getInteger( value ).doubleValue() / 1000.0 );
+					final int timeout = (int) round( getInteger( value ).doubleValue() / 1000.0 );
 					applyTimeoutHint( timeout );
 					return true;
 				case HINT_COMMENT:
@@ -621,15 +624,13 @@ public int getFirstResult() {
 	@Override
 	public abstract ParameterMetadataImplementor getParameterMetadata();
 
-	@SuppressWarnings({"unchecked", "rawtypes"})
 	public Set<Parameter<?>> getParameters() {
 		checkOpenNoRollback();
-		return (Set) getParameterMetadata().getRegistrations();
+		return unmodifiableSet( getParameterMetadata().getRegistrations() );
 	}
 
 	public QueryParameterImplementor<?> getParameter(String name) {
 		checkOpenNoRollback();
-
 		try {
 			return getParameterMetadata().getQueryParameter( name );
 		}
@@ -638,21 +639,20 @@ public QueryParameterImplementor<?> getParameter(String name) {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
 	public <T> QueryParameterImplementor<T> getParameter(String name, Class<T> type) {
 		checkOpenNoRollback();
-
 		try {
-			//noinspection rawtypes
-			final QueryParameterImplementor parameter = getParameterMetadata().getQueryParameter( name );
-			if ( !type.isAssignableFrom( parameter.getParameterType() ) ) {
+			final var parameter = getParameterMetadata().getQueryParameter( name );
+			final var parameterType = parameter.getParameterType();
+			if ( !type.isAssignableFrom( parameterType ) ) {
 				throw new IllegalArgumentException(
-						"The type [" + parameter.getParameterType().getName() +
-								"] associated with the parameter corresponding to name [" + name +
-								"] is not assignable to requested Java type [" + type.getName() + "]"
+						"Type specified for parameter named '" + name + "' is incompatible"
+						+ " (" + parameterType.getName() + " is not assignable to " + type.getName() + ")"
 				);
 			}
-			return parameter;
+			@SuppressWarnings("unchecked") // safe, just checked
+			var castParameter = (QueryParameterImplementor<T>) parameter;
+			return castParameter;
 		}
 		catch ( HibernateException e ) {
 			throw getExceptionConverter().convert( e );
@@ -661,7 +661,6 @@ public <T> QueryParameterImplementor<T> getParameter(String name, Class<T> type)
 
 	public QueryParameterImplementor<?> getParameter(int position) {
 		checkOpenNoRollback();
-
 		try {
 			return getParameterMetadata().getQueryParameter( position );
 		}
@@ -670,20 +669,20 @@ public QueryParameterImplementor<?> getParameter(int position) {
 		}
 	}
 
-	@SuppressWarnings( {"unchecked", "rawtypes"} )
 	public <T> QueryParameterImplementor<T> getParameter(int position, Class<T> type) {
 		checkOpenNoRollback();
-
 		try {
-			final QueryParameterImplementor parameter = getParameterMetadata().getQueryParameter( position );
-			if ( !type.isAssignableFrom( parameter.getParameterType() ) ) {
+			final var parameter = getParameterMetadata().getQueryParameter( position );
+			final var parameterType = parameter.getParameterType();
+			if ( !type.isAssignableFrom( parameterType ) ) {
 				throw new IllegalArgumentException(
-						"The type [" + parameter.getParameterType().getName() +
-								"] associated with the parameter corresponding to position [" + position +
-								"] is not assignable to requested Java type [" + type.getName() + "]"
+						"Type specified for parameter at position " + position + " is incompatible"
+						+ " (" + parameterType.getName() + " is not assignable to " + type.getName() + ")"
 				);
 			}
-			return parameter;
+			@SuppressWarnings("unchecked") // safe, just checked
+			var castParameter = (QueryParameterImplementor<T>) parameter;
+			return castParameter;
 		}
 		catch ( HibernateException e ) {
 			throw getExceptionConverter().convert( e );
@@ -703,15 +702,41 @@ private <P> JavaType<P> getJavaType(Class<P> javaType) {
 				.resolveDescriptor( javaType );
 	}
 
-	protected <P> QueryParameterBinding<P> locateBinding(Parameter<P> parameter) {
+	protected <P> QueryParameterBinding<P> locateBinding(Parameter<P> parameter, P value) {
 		if ( parameter instanceof QueryParameterImplementor<P> parameterImplementor ) {
 			return locateBinding( parameterImplementor );
 		}
-		else if ( parameter.getName() != null ) {
-			return locateBinding( parameter.getName() );
+		else {
+			final String name = parameter.getName();
+			final Integer position = parameter.getPosition();
+			final var parameterType = parameter.getParameterType();
+			if ( name != null ) {
+				return locateBinding( name, parameterType, value );
+			}
+			else if ( position != null ) {
+				return locateBinding( position, parameterType, value );
+			}
 		}
-		else if ( parameter.getPosition() != null ) {
-			return locateBinding( parameter.getPosition() );
+
+		throw getExceptionConverter().convert(
+				new IllegalArgumentException( "Could not resolve binding for given parameter reference [" + parameter + "]" )
+		);
+	}
+
+	protected <P> QueryParameterBinding<P> locateBinding(Parameter<P> parameter, Collection<? extends P> values) {
+		if ( parameter instanceof QueryParameterImplementor<P> parameterImplementor ) {
+			return locateBinding( parameterImplementor );
+		}
+		else {
+			final String name = parameter.getName();
+			final Integer position = parameter.getPosition();
+			final var parameterType = parameter.getParameterType();
+			if ( name != null ) {
+				return locateBinding( name, parameterType, values );
+			}
+			else if ( position != null ) {
+				return locateBinding( position, parameterType, values );
+			}
 		}
 
 		throw getExceptionConverter().convert(
@@ -721,17 +746,80 @@ else if ( parameter.getPosition() != null ) {
 
 	protected <P> QueryParameterBinding<P> locateBinding(QueryParameterImplementor<P> parameter) {
 		getCheckOpen();
-		return getQueryParameterBindings().getBinding( getQueryParameter( parameter ) );
+		return getQueryParameterBindings()
+				.getBinding( getQueryParameter( parameter ) );
 	}
 
-	protected <P> QueryParameterBinding<P> locateBinding(String name) {
+	protected <P> QueryParameterBinding<P> locateBinding(String name, Class<P> javaType, P value) {
 		getCheckOpen();
-		return getQueryParameterBindings().getBinding( name );
+		final var binding = getQueryParameterBindings().getBinding( name );
+		final var parameterType = binding.getBindType();
+		if ( parameterType != null ) {
+			final var parameterJavaType = parameterType.getJavaType();
+			if ( !parameterJavaType.isAssignableFrom( javaType )
+					&& !isInstance( parameterType, value, getNodeBuilder() ) ) {
+				throw new QueryArgumentException(
+						"Argument to parameter named '" + name + "' has an incompatible type",
+						parameterJavaType, javaType, value );
+			}
+		}
+		@SuppressWarnings("unchecked") // safe, just checked
+		var castBinding = (QueryParameterBinding<P>) binding;
+		return castBinding;
 	}
 
-	protected <P> QueryParameterBinding<P> locateBinding(int position) {
+	protected <P> QueryParameterBinding<P> locateBinding(int position, Class<P> javaType, P value) {
 		getCheckOpen();
-		return getQueryParameterBindings().getBinding( position );
+		final var binding = getQueryParameterBindings().getBinding( position );
+		final var parameterType = binding.getBindType();
+		if ( parameterType != null ) {
+			final var parameterJavaType = parameterType.getJavaType();
+			if ( !parameterJavaType.isAssignableFrom( javaType )
+					&& !isInstance( parameterType, value, getNodeBuilder() ) ) {
+				throw new QueryArgumentException(
+						"Argument to parameter at position " + position + " has an incompatible type",
+						parameterJavaType, javaType, value );
+			}
+		}
+		@SuppressWarnings("unchecked") // safe, just checked
+		var castBinding = (QueryParameterBinding<P>) binding;
+		return castBinding;
+	}
+
+	protected <P> QueryParameterBinding<P> locateBinding(String name, Class<P> javaType, Collection<? extends P> values) {
+		getCheckOpen();
+		final var binding = getQueryParameterBindings().getBinding( name );
+		final var parameterType = binding.getBindType();
+		if ( parameterType != null ) {
+			final var parameterJavaType = parameterType.getJavaType();
+			if ( !parameterJavaType.isAssignableFrom( javaType )
+					&& !areInstances( parameterType, values, getNodeBuilder() ) ) {
+				throw new QueryArgumentException(
+						"Argument to parameter named '" + name + "' has an incompatible type",
+						parameterJavaType, javaType, values );
+			}
+		}
+		@SuppressWarnings("unchecked") // safe, just checked
+		var castBinding = (QueryParameterBinding<P>) binding;
+		return castBinding;
+	}
+
+	protected <P> QueryParameterBinding<P> locateBinding(int position, Class<P> javaType, Collection<? extends P> values) {
+		getCheckOpen();
+		final var binding = getQueryParameterBindings().getBinding( position );
+		final var parameterType = binding.getBindType();
+		if ( parameterType != null ) {
+			final var parameterJavaType = parameterType.getJavaType();
+			if ( !parameterJavaType.isAssignableFrom( javaType )
+					&& !areInstances( parameterType, values, getNodeBuilder() ) ) {
+				throw new QueryArgumentException(
+						"Argument to parameter at position " + position + " has an incompatible type",
+						parameterJavaType, javaType, values );
+			}
+		}
+		@SuppressWarnings("unchecked") // safe, just checked
+		var castBinding = (QueryParameterBinding<P>) binding;
+		return castBinding;
 	}
 
 	protected <P> QueryParameterImplementor<P> getQueryParameter(QueryParameterImplementor<P> parameter) {
@@ -741,22 +829,22 @@ protected <P> QueryParameterImplementor<P> getQueryParameter(QueryParameterImple
 	public boolean isBound(Parameter<?> param) {
 		getCheckOpen();
 		final var parameter = getParameterMetadata().resolve( param );
-		return parameter != null && getQueryParameterBindings().isBound( getQueryParameter( parameter ) );
+		return parameter != null
+			&& getQueryParameterBindings().isBound( getQueryParameter( parameter ) );
 	}
 
 	public <T> T getParameterValue(Parameter<T> param) {
 		checkOpenNoRollback();
-
 		final var parameter = getParameterMetadata().resolve( param );
 		if ( parameter == null ) {
 			throw new IllegalArgumentException( "The parameter [" + param + "] is not part of this Query" );
 		}
-
-		final var binding = getQueryParameterBindings().getBinding( getQueryParameter( parameter ) );
+		final var binding =
+				getQueryParameterBindings()
+						.getBinding( getQueryParameter( parameter ) );
 		if ( binding == null || !binding.isBound() ) {
 			throw new IllegalStateException( "Parameter value not yet bound : " + param.toString() );
 		}
-
 		if ( binding.isMultiValued() ) {
 			// TODO: THIS IS UNSOUND
 			//noinspection unchecked
@@ -769,54 +857,69 @@ public <T> T getParameterValue(Parameter<T> param) {
 
 	public Object getParameterValue(String name) {
 		checkOpenNoRollback();
-
-		final QueryParameterBinding<?> binding = getQueryParameterBindings().getBinding( name );
+		final var binding = getQueryParameterBindings().getBinding( name );
 		if ( !binding.isBound() ) {
 			throw new IllegalStateException( "The parameter [" + name + "] has not yet been bound" );
 		}
-
-		if ( binding.isMultiValued() ) {
-			return binding.getBindValues();
-		}
-		else {
-			return binding.getBindValue();
-		}
+		return binding.isMultiValued() ? binding.getBindValues() : binding.getBindValue();
 	}
 
 	public Object getParameterValue(int position) {
 		checkOpenNoRollback();
-
-		final QueryParameterBinding<?> binding = getQueryParameterBindings().getBinding( position );
+		final var binding = getQueryParameterBindings().getBinding( position );
 		if ( !binding.isBound() ) {
 			throw new IllegalStateException( "The parameter [" + position + "] has not yet been bound" );
 		}
-
 		return binding.isMultiValued() ? binding.getBindValues() : binding.getBindValue();
 	}
+
+	private <P> void setParameterValue(Object value, QueryParameterBinding<P> binding) {
+		final var parameterType = binding.getBindType();
+		if ( parameterType != null
+				&& !isInstanceOrAreInstances( value, binding, parameterType ) ) {
+			throw new QueryArgumentException( "Argument to query parameter has an incompatible type",
+					parameterType.getJavaType(), value.getClass(), value );
+		}
+		@SuppressWarnings("unchecked") // safe, just checked
+		final var castValue = (P) value;
+		binding.setBindValue( castValue, resolveJdbcParameterTypeIfNecessary() );
+	}
+
+	private <P> boolean isInstanceOrAreInstances(
+			Object value, QueryParameterBinding<P> binding, BindableType<? super P> parameterType) {
+		return binding.isMultiValued() && value instanceof Collection<?> values
+				? areInstances( parameterType, values, getNodeBuilder() )
+				: isInstance( parameterType, value, getNodeBuilder() );
+	}
+
 	@Override
 	public CommonQueryContract setParameter(String name, Object value) {
 		checkOpenNoRollback();
-
 		if ( value instanceof TypedParameterValue<?> typedParameterValue ) {
 			setTypedParameter( name, typedParameterValue );
 		}
 		else {
-			final QueryParameterBinding<Object> binding = getQueryParameterBindings().getBinding( name );
-			if ( multipleBinding( binding.getQueryParameter(), value )
-				&& value instanceof Collection<?> collectionValue
-				&& !isRegisteredAsBasicType( value.getClass() ) ) {
-				return setParameterList( name, collectionValue );
+			final var binding = getQueryParameterBindings().getBinding( name );
+			if ( multipleBinding( binding.getQueryParameter(), value ) ) {
+				setParameterList( name, (Collection<?>) value );
+			}
+			else {
+				setParameterValue( value, binding );
 			}
-			binding.setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
 		}
-
 		return this;
 	}
 
-	private boolean multipleBinding(QueryParameter<Object> parameter, Object value){
-		if ( parameter.allowsMultiValuedBinding() ) {
+	private boolean multipleBinding(QueryParameter<?> parameter, Object value){
+		if ( parameter.allowsMultiValuedBinding()
+				&& value instanceof Collection<?> values
+				// this check only needed for some native queries
+				&& !isRegisteredAsBasicType( value.getClass() ) ) {
 			final var hibernateType = parameter.getHibernateType();
-			return hibernateType == null || value == null || isInstance( hibernateType, value );
+			return hibernateType == null
+				|| values.isEmpty()
+				|| !isInstance( hibernateType, value, getNodeBuilder() )
+				|| isInstance( hibernateType, values.iterator().next(), getNodeBuilder() );
 		}
 		else {
 			return false;
@@ -831,13 +934,7 @@ private <T> void setTypedParameter(int position, TypedParameterValue<T> typedVal
 		setParameter( position, typedValue.value(), typedValue.type() );
 	}
 
-	private boolean isInstance(Type<?> parameterType, Object value) {
-		final SqmExpressible<?> sqmExpressible = getNodeuilder().resolveExpressible( parameterType );
-		assert sqmExpressible != null;
-		return sqmExpressible.getExpressibleJavaType().isInstance( value );
-	}
-
-	private NodeBuilder getNodeuilder() {
+	private NodeBuilder getNodeBuilder() {
 		return getSessionFactory().getQueryEngine().getCriteriaBuilder();
 	}
 
@@ -855,31 +952,30 @@ public <P> CommonQueryContract setParameter(String name, P value, Class<P> javaT
 
 	@Override
 	public <P> CommonQueryContract setParameter(String name, P value, Type<P> type) {
-		this.<P>locateBinding( name ).setBindValue( value, (BindableType<P>) type );
+		locateBinding( name, type.getJavaType(), value ).setBindValue( value, (BindableType<P>) type );
 		return this;
 	}
 
 	@Override @Deprecated(since = "7")
 	public CommonQueryContract setParameter(String name, Instant value, TemporalType temporalType) {
-		this.locateBinding( name ).setBindValue( value, temporalType );
+		locateBinding( name, Instant.class, value ).setBindValue( value, temporalType );
 		return this;
 	}
 
 	@Override
 	public CommonQueryContract setParameter(int position, Object value) {
 		checkOpenNoRollback();
-
 		if ( value instanceof TypedParameterValue<?> typedParameterValue ) {
 			setTypedParameter( position, typedParameterValue );
 		}
 		else {
-			final QueryParameterBinding<Object> binding = getQueryParameterBindings().getBinding( position );
-			if ( multipleBinding( binding.getQueryParameter(), value )
-				&& value instanceof Collection<?> collectionValue
-				&& !isRegisteredAsBasicType( value.getClass() ) ) {
-				return setParameterList( position, collectionValue );
+			final var binding = getQueryParameterBindings().getBinding( position );
+			if ( multipleBinding( binding.getQueryParameter(), value ) ) {
+				setParameterList( position, (Collection<?>) value );
+			}
+			else {
+				setParameterValue( value, binding );
 			}
-			binding.setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
 		}
 		return this;
 	}
@@ -902,19 +998,20 @@ public <P> CommonQueryContract setParameter(int position, P value, Class<P> java
 
 	@Override
 	public <P> CommonQueryContract setParameter(int position, P value, Type<P> type) {
-		this.<P>locateBinding( position ).setBindValue( value, (BindableType<P>) type );
+		locateBinding( position, type.getJavaType(), value ).setBindValue( value, (BindableType<P>) type );
 		return this;
 	}
 
 	@Override @Deprecated(since = "7")
 	public CommonQueryContract setParameter(int position, Instant value, TemporalType temporalType) {
-		this.locateBinding( position ).setBindValue( value, temporalType );
+		locateBinding( position, Instant.class, value ).setBindValue( value, temporalType );
 		return this;
 	}
 
 	@Override
 	public <P> CommonQueryContract setParameter(QueryParameter<P> parameter, P value) {
-		locateBinding( parameter ).setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
+		locateBinding( parameter, value )
+				.setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
 		return this;
 	}
 
@@ -932,7 +1029,8 @@ public <P> CommonQueryContract setParameter(QueryParameter<P> parameter, P value
 
 	@Override
 	public <P> CommonQueryContract setParameter(QueryParameter<P> parameter, P value, Type<P> type) {
-		locateBinding( parameter ).setBindValue( value, (BindableType<P>) type );
+		locateBinding( parameter, value )
+				.setBindValue( value, (BindableType<P>) type );
 		return this;
 	}
 
@@ -951,75 +1049,67 @@ public <P> CommonQueryContract setParameter(Parameter<P> parameter, P value) {
 			}
 			@SuppressWarnings("unchecked") // safe, because we just checked
 			final var typedValue = (TypedParameterValue<P>) value;
-			setParameter( parameter, typedValue.value(), typedValue.type() );
+			final var castValue = typedValue.value();
+			final var castType = typedValue.type();
+			if ( parameter instanceof QueryParameter<P> queryParameter ) {
+				setParameter( queryParameter, castValue, castType );
+			}
+			else {
+				locateBinding( parameter, castValue )
+						.setBindValue( castValue, castType );
+			}
 		}
 		else {
-			locateBinding( parameter ).setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
+			locateBinding( parameter, value )
+					.setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
 		}
 		return this;
 	}
 
-	private <P> void setParameter(Parameter<P> parameter, P value, Type<P> type) {
-		if ( parameter instanceof QueryParameter<P> queryParameter ) {
-			setParameter( queryParameter, value, type );
-		}
-		else if ( value == null ) {
-			locateBinding( parameter ).setBindValue( null, (BindableType<P>) type );
-		}
-		else if ( value instanceof Collection ) {
-			//TODO: this looks wrong to me: how can value be both a P and a (Collection<P>)?
-			locateBinding( parameter ).setBindValues( (Collection<P>) value );
-		}
-		else {
-			locateBinding( parameter ).setBindValue( value, (BindableType<P>) type );
-		}
-	}
-
-
 	@Override @Deprecated
 	public CommonQueryContract setParameter(Parameter<Calendar> param, Calendar value, TemporalType temporalType) {
-		locateBinding( param ).setBindValue( value, temporalType );
+		locateBinding( param, value ).setBindValue( value, temporalType );
 		return this;
 	}
 
 	@Override @Deprecated
 	public CommonQueryContract setParameter(Parameter<Date> param, Date value, TemporalType temporalType) {
-		locateBinding( param ).setBindValue( value, temporalType );
+		locateBinding( param, value ).setBindValue( value, temporalType );
 		return this;
 	}
 
 	@Override @Deprecated
 	public CommonQueryContract setParameter(String name, Calendar value, TemporalType temporalType) {
-		locateBinding( name ).setBindValue( value, temporalType );
+		locateBinding( name, Calendar.class, value ).setBindValue( value, temporalType );
 		return this;
 	}
 
 	@Override @Deprecated
 	public CommonQueryContract setParameter(String name, Date value, TemporalType temporalType) {
-		locateBinding( name ).setBindValue( value, temporalType );
+		locateBinding( name, Date.class, value ).setBindValue( value, temporalType );
 		return this;
 	}
 
 	@Override @Deprecated
 	public CommonQueryContract setParameter(int position, Calendar value, TemporalType temporalType) {
-		locateBinding( position ).setBindValue( value, temporalType );
+		locateBinding( position, Calendar.class, value ).setBindValue( value, temporalType );
 		return this;
 	}
 
 	@Override @Deprecated
 	public CommonQueryContract setParameter(int position, Date value, TemporalType temporalType) {
-		locateBinding( position ).setBindValue( value, temporalType );
+		locateBinding( position, Date.class, value ).setBindValue( value, temporalType );
 		return this;
 	}
 
 	@Override
 	public CommonQueryContract setParameterList(String name, @SuppressWarnings("rawtypes") Collection values) {
-		locateBinding( name ).setBindValues( values );
+		getQueryParameterBindings().getBinding( name ).setBindValues( values );
 		return this;
 	}
 
 	public <P> CommonQueryContract setParameterList(String name, Collection<? extends P> values, Class<P> javaType) {
-		final JavaType<P> javaDescriptor = getJavaType( javaType );
+		final var javaDescriptor = getJavaType( javaType );
 		if ( javaDescriptor == null ) {
 			setParameterList( name, values );
 		}
@@ -1032,16 +1122,30 @@ public <P> CommonQueryContract setParameterList(String name, Collection<? extend
 
 	@Override
 	public <P> CommonQueryContract setParameterList(String name, Collection<? extends P> values, Type<P> type) {
-		this.<P>locateBinding( name ).setBindValues( values, (BindableType<P>) type );
+		locateBinding( name, type.getJavaType(), values )
+				.setBindValues( values, (BindableType<P>) type );
 		return this;
 	}
 
 	@Override
 	public CommonQueryContract setParameterList(String name, Object[] values) {
-		locateBinding( name ).setBindValues( asList( values ) );
+		final var binding = getQueryParameterBindings().getBinding( name );
+		setParameterValues( values, binding );
 		return this;
 	}
 
+	private <P> void setParameterValues(Object[] values, QueryParameterBinding<P> binding) {
+		final var parameterType = binding.getBindType();
+		if ( parameterType != null
+				&& !areInstances( parameterType, values, getNodeBuilder() ) ) {
+			throw new QueryArgumentException( "Argument to query parameter has an incompatible type",
+					parameterType.getJavaType(), values.getClass().getComponentType(), values );
+		}
+		@SuppressWarnings("unchecked") // safe, just checked
+		final var castArray = (P[]) values;
+		binding.setBindValues( List.of( castArray ) );
+	}
+
 	@Override
 	public <P> CommonQueryContract setParameterList(String name, P[] values, Class<P> javaType) {
 		final var javaDescriptor = getJavaType( javaType );
@@ -1055,13 +1159,16 @@ public <P> CommonQueryContract setParameterList(String name, P[] values, Class<P
 	}
 
 	public <P> CommonQueryContract setParameterList(String name, P[] values, Type<P> type) {
-		this.<P>locateBinding( name ).setBindValues( asList( values ), (BindableType<P>) type );
+		final var list = List.of( values );
+		locateBinding( name, type.getJavaType(), list )
+				.setBindValues( list, (BindableType<P>) type );
 		return this;
 	}
 
 	@Override
 	public CommonQueryContract setParameterList(int position, @SuppressWarnings("rawtypes") Collection values) {
-		locateBinding( position ).setBindValues( values );
+		//TODO: type checking?
+		getQueryParameterBindings().getBinding( position ).setBindValues( values );
 		return this;
 	}
 
@@ -1099,13 +1206,15 @@ private <P> Type<P> getParamType(Class<P> javaType) {
 
 	@Override
 	public <P> CommonQueryContract setParameterList(int position, Collection<? extends P> values, Type<P> type) {
-		this.<P>locateBinding( position ).setBindValues( values, (BindableType<P>) type );
+		locateBinding( position, type.getJavaType(), values )
+				.setBindValues( values, (BindableType<P>) type );
 		return this;
 	}
 
 	@Override
 	public CommonQueryContract setParameterList(int position, Object[] values) {
-		locateBinding( position ).setBindValues( asList( values ) );
+		final var binding = getQueryParameterBindings().getBinding( position );
+		setParameterValues( values, binding );
 		return this;
 	}
 
@@ -1118,20 +1227,20 @@ public <P> CommonQueryContract setParameterList(int position, P[] values, Class<
 		else {
 			setParameterList( position, values, getParamType( javaType ) );
 		}
-
 		return this;
 	}
 
-	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public <P> CommonQueryContract setParameterList(int position, P[] values, Type<P> type) {
-		locateBinding( position ).setBindValues( asList( values ), (BindableType) type );
+		final var list = List.of( values );
+		locateBinding( position, type.getJavaType(), list )
+				.setBindValues( list, (BindableType<P>) type );
 		return this;
 	}
 
 
 	@Override
 	public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, Collection<? extends P> values) {
-		locateBinding( parameter ).setBindValues( values );
+		locateBinding( parameter, values ).setBindValues( values );
 		return this;
 	}
 
@@ -1149,13 +1258,15 @@ public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, Col
 
 	@Override
 	public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, Collection<? extends P> values, Type<P> type) {
-		locateBinding( parameter ).setBindValues( values, (BindableType<P>) type );
+		locateBinding( parameter, values )
+				.setBindValues( values, (BindableType<P>) type );
 		return this;
 	}
 
 	@Override
 	public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, P[] values) {
-		locateBinding( parameter ).setBindValues( values == null ? null : asList( values ) );
+		final var list = List.of( values );
+		locateBinding( parameter, list ).setBindValues( list );
 		return this;
 	}
 
@@ -1168,13 +1279,14 @@ public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, P[]
 		else {
 			setParameterList( parameter, values, getParamType( javaType ) );
 		}
-
 		return this;
 	}
 
 	@Override
 	public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, P[] values, Type<P> type) {
-		locateBinding( parameter ).setBindValues( asList( values ), (BindableType<P>) type );
+		final var list = List.of( values );
+		locateBinding( parameter, list )
+				.setBindValues( list, (BindableType<P>) type );
 		return this;
 	}
 
@@ -1184,7 +1296,8 @@ public CommonQueryContract setProperties(@SuppressWarnings("rawtypes") Map map)
 			final Object object = map.get( paramName );
 			if ( object == null ) {
 				if ( map.containsKey( paramName ) ) {
-					setParameter( paramName, null, determineType( paramName, null ) );
+					setParameter( paramName, null,
+							determineType( paramName, null ) );
 				}
 			}
 			else {
@@ -1195,7 +1308,8 @@ else if ( object instanceof Object[] array ) {
 					setParameterList( paramName, array );
 				}
 				else {
-					setParameter( paramName, object, determineType( paramName, object.getClass() ) );
+					setParameter( paramName, object,
+							determineType( paramName, object.getClass() ) );
 				}
 			}
 		}
@@ -1203,14 +1317,15 @@ else if ( object instanceof Object[] array ) {
 	}
 
 	protected <T> Type<T> determineType(String namedParam, Class<? extends T> retType) {
-		BindableType<?> type = locateBinding( namedParam ).getBindType();
+		var type = getQueryParameterBindings().getBinding( namedParam ).getBindType();
 		if ( type == null ) {
 			type = getParameterMetadata().getQueryParameter( namedParam ).getHibernateType();
 		}
 		if ( type == null && retType != null ) {
 			type = getSessionFactory().getMappingMetamodel().resolveParameterBindType( retType );
 		}
-		if ( retType!= null && !retType.isAssignableFrom( type.getJavaType() ) ) {
+		if ( retType != null && !retType.isAssignableFrom( type.getJavaType() ) ) {
+			// TODO: is this really the correct exception type?
 			throw new IllegalStateException( "Parameter not of expected type: " + retType.getName() );
 		}
 		//noinspection unchecked
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java
index 83d1d482e522..351f874e8711 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java
@@ -4,236 +4,105 @@
  */
 package org.hibernate.query.spi;
 
-import java.util.Calendar;
 import java.util.Collection;
-import java.util.Date;
 
+import org.hibernate.Internal;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.QueryArgumentException;
-import org.hibernate.query.sqm.SqmBindableType;
 import org.hibernate.type.BindableType;
-import org.hibernate.type.BindingContext;
-import org.hibernate.type.descriptor.java.JavaType;
 
-import jakarta.persistence.TemporalType;
+import static org.hibernate.query.internal.QueryArguments.areInstances;
+import static org.hibernate.query.internal.QueryArguments.isInstance;
 
 /**
  * @author Andrea Boriero
  */
+@Internal
 public class QueryParameterBindingValidator {
 
-	public static final QueryParameterBindingValidator INSTANCE = new QueryParameterBindingValidator();
-
 	private QueryParameterBindingValidator() {
 	}
 
-	public void validate(BindableType<?> paramType, Object bind, BindingContext bindingContext) {
-		validate( paramType, bind, null, bindingContext );
-	}
-
-	public void validate(
-			BindableType<?> paramType,
-			Object bind,
-			TemporalType temporalPrecision,
-			BindingContext bindingContext) {
-		if ( bind == null || paramType == null ) {
-			// nothing we can check
-			return;
-		}
-
-		final SqmBindableType<?> sqmExpressible = bindingContext.resolveExpressible( paramType );
-		final Class<?> parameterJavaType =
-				paramType.getJavaType() != null
-						? paramType.getJavaType()
-						: sqmExpressible.getJavaType();
-
-		if ( parameterJavaType != null ) {
-			if ( bind instanceof Collection<?> collection
-					&& !Collection.class.isAssignableFrom( parameterJavaType ) ) {
-				// we have a collection passed in where we are expecting a non-collection.
-				// 		NOTE : this can happen in Hibernate's notion of "parameter list" binding
-				// 		NOTE2 : the case of a collection value and an expected collection (if that can even happen)
-				//			will fall through to the main check.
-				validateCollectionValuedParameterBinding(
-						parameterJavaType,
-						collection,
-						temporalPrecision
-				);
-			}
-			else if ( bind.getClass().isArray() ) {
-				validateArrayValuedParameterBinding(
-						parameterJavaType,
-						bind,
-						temporalPrecision
-				);
-			}
-			else if ( !isValidBindValue(
-					sqmExpressible.getExpressibleJavaType(),
-					parameterJavaType,
-					bind,
-					temporalPrecision
-			) ) {
-				throw new QueryArgumentException(
-						String.format(
-								"Argument [%s] of type [%s] did not match parameter type [%s (%s)]",
-								bind,
-								bind.getClass().getName(),
-								parameterJavaType.getName(),
-								extractName( temporalPrecision )
-						),
-						parameterJavaType,
-						bind
-				);
+	public static void validate(BindableType<?> parameterType, Object argument, SessionFactoryImplementor factory) {
+		if ( argument != null && parameterType != null ) {
+			final var parameterJavaType = getParameterJavaType( parameterType, factory );
+			if ( parameterJavaType != null ) {
+				if ( argument instanceof Collection<?> collection
+						&& !Collection.class.isAssignableFrom( parameterJavaType ) ) {
+					// we have a collection passed in where we are expecting a non-collection.
+					// 		NOTE: this can happen in Hibernate's notion of "parameter list" binding
+					// 		NOTE2: the case of a collection value and an expected collection (if that can even happen)
+					//			   will fall through to the main check.
+					validateCollectionValuedParameterBinding( parameterType, parameterJavaType, collection, factory );
+				}
+				else if ( argument.getClass().isArray() ) {
+					validateArrayValuedParameterBinding( parameterJavaType, argument );
+				}
+				else {
+					validateSingleValuedParameterBinding( parameterType, parameterJavaType, argument, factory );
+				}
 			}
+			// else nothing we can check
 		}
-		// else nothing we can check
-	}
-
-	private String extractName(TemporalType temporalType) {
-		return temporalType == null ? "n/a" : temporalType.name();
 	}
 
-	private void validateCollectionValuedParameterBinding(
-			Class<?> parameterType,
-			Collection<?> value,
-			TemporalType temporalType) {
-		// validate the elements...
-		for ( Object element : value ) {
-			if ( !isValidBindValue( parameterType, element, temporalType ) ) {
-				throw new QueryArgumentException(
-						String.format(
-								"Parameter value element [%s] did not match expected type [%s (%s)]",
-								element,
-								parameterType.getName(),
-								extractName( temporalType )
-						)
-						,
-						parameterType,
-						element
-				);
-			}
-		}
+	private static Class<?> getParameterJavaType(BindableType<?> parameterType, SessionFactoryImplementor factory) {
+		final var javaType = parameterType.getJavaType();
+		return javaType != null
+				? javaType
+				: factory.getQueryEngine().getCriteriaBuilder()
+						.resolveExpressible( parameterType )
+						.getJavaType();
 	}
 
-	private static boolean isValidBindValue(
-			JavaType<?> expectedJavaType,
-			Class<?> expectedType,
+	private static void validateSingleValuedParameterBinding(
+			BindableType<?> parameterType, Class<?> parameterJavaType,
 			Object value,
-			TemporalType temporalType) {
-		if ( value == null ) {
-			return true;
+			SessionFactoryImplementor factory) {
+		if ( !isInstance( parameterType, value,
+				factory.getQueryEngine().getCriteriaBuilder() ) ) {
+			throw new QueryArgumentException( "Argument did not match parameter type",
+					parameterJavaType, value );
 		}
-		else if ( expectedJavaType.isInstance( value ) ) {
-			return true;
-		}
-		else if ( temporalType != null ) {
-			final boolean parameterDeclarationIsTemporal = Date.class.isAssignableFrom( expectedType )
-					|| Calendar.class.isAssignableFrom( expectedType );
-			final boolean bindIsTemporal = value instanceof Date
-					|| value instanceof Calendar;
-
-			return parameterDeclarationIsTemporal && bindIsTemporal;
-		}
-
-		return false;
 	}
 
-	private static boolean isValidBindValue(
-			Class<?> expectedType,
-			Object value,
-			TemporalType temporalType) {
-		if ( expectedType.isPrimitive() ) {
-			if ( expectedType == boolean.class ) {
-				return value instanceof Boolean;
-			}
-			else if ( expectedType == char.class ) {
-				return value instanceof Character;
-			}
-			else if ( expectedType == byte.class ) {
-				return value instanceof Byte;
-			}
-			else if ( expectedType == short.class ) {
-				return value instanceof Short;
-			}
-			else if ( expectedType == int.class ) {
-				return value instanceof Integer;
-			}
-			else if ( expectedType == long.class ) {
-				return value instanceof Long;
-			}
-			else if ( expectedType == float.class ) {
-				return value instanceof Float;
-			}
-			else if ( expectedType == double.class ) {
-				return value instanceof Double;
-			}
-			return false;
-		}
-		else if ( value == null) {
-			return true;
-		}
-		else if ( expectedType.isInstance( value ) ) {
-			return true;
-		}
-		else if ( temporalType != null ) {
-			final boolean parameterDeclarationIsTemporal = Date.class.isAssignableFrom( expectedType )
-					|| Calendar.class.isAssignableFrom( expectedType );
-			final boolean bindIsTemporal = value instanceof Date
-					|| value instanceof Calendar;
+	private static void validateCollectionValuedParameterBinding(
+			BindableType<?> parameterType, Class<?> parameterJavaType,
+			Collection<?> values,
+			SessionFactoryImplementor factory) {
+		if ( !areInstances( parameterType, values,
+				factory.getQueryEngine().getCriteriaBuilder() ) ) {
+			throw new QueryArgumentException( "Collection-valued argument did not match parameter type",
+					parameterJavaType, values );
 
-			return parameterDeclarationIsTemporal && bindIsTemporal;
 		}
-
-		return false;
 	}
 
-	private void validateArrayValuedParameterBinding(
-			Class<?> parameterType,
-			Object value,
-			TemporalType temporalType) {
+	private static void validateArrayValuedParameterBinding(Class<?> parameterType, Object value) {
 		if ( !parameterType.isArray() ) {
-			throw new QueryArgumentException(
-					String.format(
-							"Encountered array-valued parameter binding, but was expecting [%s (%s)]",
-							parameterType.getName(),
-							extractName( temporalType )
-					),
-					parameterType,
-					value
-			);
+			throw new QueryArgumentException( "Unexpected array-valued parameter binding",
+					parameterType, value );
 		}
 
-		if ( value.getClass().getComponentType().isPrimitive() ) {
-			// we have a primitive array.  we validate that the actual array has the component type (type of elements)
-			// we expect based on the component type of the parameter specification
-			if ( !parameterType.getComponentType().isAssignableFrom( value.getClass().getComponentType() ) ) {
-				throw new QueryArgumentException(
-						String.format(
-								"Primitive array-valued parameter bind value type [%s] did not match expected type [%s (%s)]",
-								value.getClass().getComponentType().getName(),
-								parameterType.getName(),
-								extractName( temporalType )
-						),
-						parameterType,
-						value
-				);
+		final var componentType = value.getClass().getComponentType();
+		final var parameterComponentType = parameterType.getComponentType();
+		if ( componentType.isPrimitive() ) {
+			// We have a primitive array.
+			// We validate that the actual array has the component type (type of elements)
+			// that we expect based on the component type of the parameter specification.
+			if ( !parameterComponentType.isAssignableFrom( componentType ) ) {
+				throw new QueryArgumentException( "Primitive array-valued argument type did not match parameter type",
+						parameterType, value );
 			}
 		}
 		else {
-			// we have an object array.  Here we loop over the array and physically check each element against
-			// the type we expect based on the component type of the parameter specification
-			final Object[] array = (Object[]) value;
-			for ( Object element : array ) {
-				if ( !isValidBindValue( parameterType.getComponentType(), element, temporalType ) ) {
-					throw new QueryArgumentException(
-							String.format(
-									"Array-valued parameter value element [%s] did not match expected type [%s (%s)]",
-									element,
-									parameterType.getName(),
-									extractName( temporalType )
-							),
-							parameterType,
-							array
-					);
+			// We have an object array.
+			// Here we loop over the array and physically check each element against the
+			// type we expect based on the component type of the parameter specification.
+			for ( Object element : (Object[]) value ) {
+				if ( element != null && !parameterComponentType.isInstance( element ) ) {
+					throw new QueryArgumentException( "Array element did not match parameter element type",
+							parameterComponentType, element );
 				}
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java
index 782eecfc15ff..faffc2c44f27 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java
@@ -58,7 +58,7 @@ default <P> QueryParameterBinding<P> getBinding(QueryParameter<P> parameter) {
 	 *
 	 * @return The binding, or {@code null} if not yet bound
 	 */
-	<P> QueryParameterBinding<P> getBinding(String name);
+	QueryParameterBinding<?> getBinding(String name);
 
 	/**
 	 * Access to the binding via position
@@ -67,7 +67,7 @@ default <P> QueryParameterBinding<P> getBinding(QueryParameter<P> parameter) {
 	 *
 	 * @return The binding, or {@code null} if not yet bound
 	 */
-	<P> QueryParameterBinding<P> getBinding(int position);
+	QueryParameterBinding<?> getBinding(int position);
 
 	/**
 	 * Validate the bindings.  Called just before execution
@@ -94,15 +94,15 @@ default <P> QueryParameterBinding<P> getBinding(QueryParameter<P> parameter) {
 	 *             Currently unused and can be safely removed.
 	 */
 	@Deprecated(forRemoval = true, since = "6.6")
-	@SuppressWarnings({"rawtypes", "unchecked"})
+//	@SuppressWarnings({"rawtypes", "unchecked"})
 	QueryParameterBindings NO_PARAM_BINDINGS = new QueryParameterBindings() {
 		@Override
-		public boolean isBound(QueryParameterImplementor parameter) {
+		public boolean isBound(QueryParameterImplementor<?> parameter) {
 			return false;
 		}
 
 		@Override
-		public QueryParameterBinding<?> getBinding(QueryParameterImplementor parameter) {
+		public <P> QueryParameterBinding<P> getBinding(QueryParameterImplementor<P> parameter) {
 			return null;
 		}
 
@@ -117,7 +117,7 @@ public QueryParameterBinding<?> getBinding(int position) {
 		}
 
 		@Override
-		public void visitBindings(BiConsumer action) {
+		public void visitBindings(BiConsumer<? super QueryParameter<?>, ? super QueryParameterBinding<?>> action) {
 		}
 
 		@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java
index e3b4064d1885..44f8605e4c16 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java
@@ -75,7 +75,7 @@ public String getName() {
 
 	@Override
 	public SqmParameter<T> copy() {
-		return new SqmNamedParameter<>( getName(), allowMultiValuedBinding(), this.getNodeType(), nodeBuilder() );
+		return new SqmNamedParameter<>( getName(), allowMultiValuedBinding(), getNodeType(), nodeBuilder() );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java
index 3bc1e90b605b..41553b340ab9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java
@@ -29,6 +29,7 @@ public class BooleanJavaType extends AbstractClassJavaType<Boolean> implements
 	private final char characterValueFalse;
 
 	private final char characterValueTrueLC;
+	private final char characterValueFalseLC;
 
 	private final String stringValueTrue;
 	private final String stringValueFalse;
@@ -43,6 +44,7 @@ public BooleanJavaType(char characterValueTrue, char characterValueFalse) {
 		this.characterValueFalse = toUpperCase( characterValueFalse );
 
 		characterValueTrueLC = Character.toLowerCase( characterValueTrue );
+		characterValueFalseLC = Character.toLowerCase( characterValueFalse );
 
 		stringValueTrue = String.valueOf( characterValueTrue );
 		stringValueFalse = String.valueOf( characterValueFalse );
@@ -123,16 +125,35 @@ public <X> Boolean wrap(X value, WrapperOptions options) {
 			return number.intValue() != 0;
 		}
 		if (value instanceof Character character) {
-			return isTrue( character );
+			if ( isTrue( character ) ) {
+				return true;
+			}
+			if ( isFalse( character ) ) {
+				return false;
+			}
+			throw new IllegalArgumentException( "Cannot convert Character value '" + character + "' to Boolean" );
 		}
 		if (value instanceof String string) {
-			return isTrue( string );
+			if ( isTrue( string ) ) {
+				return true;
+			}
+			if ( isFalse( string ) ) {
+				return false;
+			}
+			throw new IllegalArgumentException( "Cannot convert value '" + string + "' to Boolean" );
 		}
 		throw unknownWrap( value.getClass() );
 	}
 
 	private boolean isTrue(String strValue) {
-		return strValue != null && !strValue.isEmpty() && isTrue( strValue.charAt(0) );
+		return strValue != null
+			&& !strValue.isEmpty()
+			&& isTrue( strValue.charAt(0) );
+	}
+
+	private boolean isFalse(String strValue) {
+		return strValue != null
+			&& ( strValue.isEmpty() || isFalse( strValue.charAt(0) ) );
 	}
 
 	private boolean isTrue(char charValue) {
@@ -140,6 +161,11 @@ private boolean isTrue(char charValue) {
 			|| charValue == characterValueTrueLC;
 	}
 
+	private boolean isFalse(char charValue) {
+		return charValue == characterValueFalse
+			|| charValue == characterValueFalseLC;
+	}
+
 	public int toInt(Boolean value) {
 		return value ? 1 : 0;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java
index c458b8b0c7c5..336041f99ba0 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java
@@ -88,6 +88,21 @@ public int extractHashCode(Calendar value) {
 		return hashCode;
 	}
 
+	@Override
+	public boolean isInstance(Object value) {
+		return value instanceof Calendar;
+	}
+
+	@Override
+	public Calendar cast(Object value) {
+		return (Calendar) value;
+	}
+
+	@Override
+	public Calendar coerce(Object value) {
+		return wrap( value, null );
+	}
+
 	public <X> X unwrap(Calendar value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java
index 10c49e839895..324b4d3d919c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java
@@ -105,6 +105,21 @@ public int extractHashCode(Calendar value) {
 		return hashCode;
 	}
 
+	@Override
+	public boolean isInstance(Object value) {
+		return value instanceof Calendar;
+	}
+
+	@Override
+	public Calendar cast(Object value) {
+		return (Calendar) value;
+	}
+
+	@Override
+	public Calendar coerce(Object value) {
+		return wrap( value, null );
+	}
+
 	public <X> X unwrap(Calendar value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
@@ -135,7 +150,7 @@ else if (value instanceof Calendar calendar) {
 			return calendar;
 		}
 		else if ( value instanceof java.util.Date date ) {
-			final Calendar cal = new GregorianCalendar();
+			final var cal = new GregorianCalendar();
 			cal.setTime( date );
 			return cal;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaType.java
index 60241c28889f..8273f2cf908d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaType.java
@@ -112,7 +112,12 @@ else if ( Short.class.equals( type ) ) {
 		else if ( Byte.class.equals( type ) ) {
 			return type.cast( toByte( value ) );
 		}
-		return type.cast( value );
+		else if ( type.isInstance( value )) {
+			return type.cast( value );
+		}
+		else {
+			throw unknownUnwrap( type );
+		}
 	}
 
 	@Override
@@ -138,9 +143,15 @@ else if ( value instanceof Byte byteValue ) {
 		else if ( value instanceof Number number ) {
 			return fromLong( number.longValue() );
 		}
-		else {
+		else if ( getJavaType().isInstance( value ) ) {
+			return (T) value;
+		}
+		else if ( isInstance( value ) ) {
 			return cast( value );
 		}
+		else {
+			throw unknownWrap( value.getClass() );
+		}
 	}
 
 	/**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithJavaTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithJavaTypeTest.java
index b077457e9ea6..a241312e6899 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithJavaTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithJavaTypeTest.java
@@ -48,10 +48,10 @@ public void injectSessionFactoryScope(SessionFactoryScope scope) {
 	@ValueSource(strings = {
 			"select z from EntityEmbedCustom z where embedCustom.value=:datum",
 			"select z from EntityEmbedCustom z where :datum=embedCustom.value",
-			"select z from EntityEmbedCustom z where embedCustom=:datum", // this query failed with the bug
-			"select z from EntityEmbedCustom z where :datum=embedCustom",
+			"select z from EntityEmbedCustom z where embedCustom.value=:datum", // this query failed with the bug
+			"select z from EntityEmbedCustom z where :datum=embedCustom.value",
 			"select z from EntityEmbedCustom z where embedCustom.value in (:datum)",
-			"select z from EntityEmbedCustom z where embedCustom in (:datum)" // failed as well
+			"select z from EntityEmbedCustom z where embedCustom.value in (:datum)" // failed as well
 	})
 	void hhh18898Test_embedCustom(String hql) {
 
@@ -81,10 +81,10 @@ void hhh18898Test_embedCustom(String hql) {
 	@ValueSource(strings = {
 			"select z from EntityEmbedNative z where embedNative.value=:datum",
 			"select z from EntityEmbedNative z where :datum=embedNative.value",
-			"select z from EntityEmbedNative z where embedNative=:datum", // this query failed with the bug
-			"select z from EntityEmbedNative z where :datum=embedNative",
+			"select z from EntityEmbedNative z where embedNative.value=:datum", // this query failed with the bug
+			"select z from EntityEmbedNative z where :datum=embedNative.value",
 			"select z from EntityEmbedNative z where embedNative.value in (:datum)",
-			"select z from EntityEmbedNative z where embedNative in (:datum)" // failed as well
+			"select z from EntityEmbedNative z where embedNative.value in (:datum)" // failed as well
 	})
 	void hhh18898Test_embedSingle(String hql) {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterIsNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterIsNullTest.java
index 3fdfdc50434e..45cabc140e67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterIsNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterIsNullTest.java
@@ -70,7 +70,7 @@ public void testEmptyCollectionParam(SessionFactoryScope scope) {
 			}
 			catch (Exception e) {
 				assertThat( e ).isInstanceOf( IllegalArgumentException.class );
-				assertThat( e.getMessage() ).contains( "Parameter value", "did not match expected type" );
+				assertThat( e.getMessage() ).contains( "Argument to query parameter has an incompatible type", "is not assignable to" );
 			}
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java
index 80932e0088fd..fb82b2599cf8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java
@@ -43,7 +43,7 @@ public void setParameterWithWrongTypeShouldThrowIllegalArgumentException(EntityM
 		scope.inEntityManager( entityManager -> {
 			Assertions.assertThrows(
 					IllegalArgumentException.class,
-					() -> entityManager.createQuery( "select e from TestEntity e where e.id = :id" ).setParameter( "id", 1 )
+					() -> entityManager.createQuery( "select e from TestEntity e where e.id = :id" ).setParameter( "id", "X" )
 			);
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanJavaTypeDescriptorTest.java
index 29ee5e6ad8c3..213e8cd965bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanJavaTypeDescriptorTest.java
@@ -7,6 +7,7 @@
 import jakarta.persistence.AttributeConverter;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.type.NumericBooleanConverter;
 import org.hibernate.type.TrueFalseConverter;
@@ -92,7 +93,7 @@ public void testWrapShouldReturnFalseWhenFStringGiven() {
 		assertFalse(result);
 	}
 
-	@Test
+	@Test @FailureExpected // this was historically allowed
 	public void testWrapShouldReturnFalseWhenRandomStringGiven() {
 		// given
 		// when
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DetachedProxyAsQueryParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DetachedProxyAsQueryParameterTest.java
index 09b6687c0735..9770accf0c9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DetachedProxyAsQueryParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DetachedProxyAsQueryParameterTest.java
@@ -5,7 +5,6 @@
 package org.hibernate.orm.test.proxy;
 
 import org.hibernate.Hibernate;
-import org.hibernate.LazyInitializationException;
 import org.hibernate.query.Query;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -23,7 +22,6 @@
 import jakarta.persistence.ManyToOne;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @DomainModel(
 		annotatedClasses = {
@@ -71,24 +69,17 @@ public void testQuery(SessionFactoryScope scope) {
 		scope.inSession(
 				session -> {
 					session.createQuery(
-									"select d from Department d where d = :department" )
+							"select d from Department d where d = :department" )
 							.setParameter( "department", employee.getDepartment() ).list();
 				}
 		);
 
 
-		assertThrows(
-				LazyInitializationException.class, () -> {
-					scope.inSession(
-							session -> {
-								// In order to validate the parameter and check that it is an instance of SpecialDepartment
-								// the Department proxy have to be initialized but being a detached instance
-								// a LazyInitializationException is thrown
-								session.createQuery(
-										"select d from SpecialDepartment d where d = :department"
-								).setParameter( "department", employee.getDepartment() ).list();
-							}
-					);
+		scope.inSession(
+				session -> {
+					session.createQuery(
+							"select d from SpecialDepartment d where d = :department" )
+							.setParameter( "department", employee.getDepartment() ).list();
 				}
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java
index c85e0617afdf..2845927f0922 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java
@@ -14,6 +14,8 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 /**
  * @author Andrea Boriero
  */
@@ -40,6 +42,17 @@ public void testSetParameterWithArrayWithNullElement(SessionFactoryScope scope)
 		);
 	}
 
+	@Test
+	public void testSetParameterWithArrayWithNullElementWrongType(SessionFactoryScope scope) {
+		// SimpleEntity#id is of type Integer
+		assertThrows( IllegalArgumentException.class, () ->
+				scope.inTransaction( (session) ->
+						session.createQuery( "from EntityWithBasicArray e where e.strings = :p" )
+								.setParameter( "p", new Integer[]{null, 1} )
+				)
+		);
+	}
+
 	@Entity(name = "EntityWithBasicArray")
 	public static class EntityWithBasicArray {
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/IdSelectionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/IdSelectionTests.java
index 4b21421868fa..288780b1dd95 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/IdSelectionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/IdSelectionTests.java
@@ -12,6 +12,7 @@
 import org.hibernate.query.internal.QueryParameterBindingsImpl;
 import org.hibernate.query.spi.DomainQueryExecutionContext;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.query.spi.QueryParameterBinding;
 import org.hibernate.query.spi.QueryParameterBindings;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.query.sqm.mutation.internal.MatchingIdSelectionHelper;
@@ -61,7 +62,8 @@ public void testSecondaryTableRestrictedOnRootTable(SessionFactoryScope scope) {
 				parameterMetadata,
 				scope.getSessionFactory()
 		);
-		domainParamBindings.getBinding( "n" ).setBindValue( "abc" );
+		((QueryParameterBinding) domainParamBindings.getBinding( "n" ))
+				.setBindValue( "abc" );
 
 		scope.inTransaction(
 				session -> {
@@ -86,7 +88,8 @@ public void testSecondaryTableRestrictedOnNonRootTable(SessionFactoryScope scope
 				parameterMetadata,
 				scope.getSessionFactory()
 		);
-		domainParamBindings.getBinding( "d" ).setBindValue( "123" );
+		((QueryParameterBinding) domainParamBindings.getBinding( "d" ))
+				.setBindValue( "123" );
 
 		scope.inTransaction(
 				session -> {
@@ -111,7 +114,8 @@ public void testJoinedSubclassRestrictedOnRootTable(SessionFactoryScope scope) {
 				parameterMetadata,
 				scope.getSessionFactory()
 		);
-		domainParamBindings.getBinding( "n" ).setBindValue( "Acme" );
+		((QueryParameterBinding) domainParamBindings.getBinding( "n" ))
+				.setBindValue( "Acme" );
 
 		scope.inTransaction(
 				session -> {
@@ -136,7 +140,8 @@ public void testJoinedSubclassRestrictedOnNonPrimaryRootTable(SessionFactoryScop
 				parameterMetadata,
 				scope.getSessionFactory()
 		);
-		domainParamBindings.getBinding( "n" ).setBindValue( "Acme" );
+		((QueryParameterBinding) domainParamBindings.getBinding( "n" ))
+				.setBindValue( "Acme" );
 
 		scope.inTransaction(
 				session -> {
@@ -161,7 +166,8 @@ public void testJoinedSubclassRestrictedOnPrimaryNonRootTable(SessionFactoryScop
 				parameterMetadata,
 				scope.getSessionFactory()
 		);
-		domainParamBindings.getBinding( "v" ).setBindValue( "123" );
+		((QueryParameterBinding) domainParamBindings.getBinding( "v" ))
+				.setBindValue( "123" );
 
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java
index b158d39cc1d7..8a64c726fcad 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java
@@ -59,7 +59,7 @@ public void testParameterRegisteredCollection(SessionFactoryScope factoryScope)
 		} );
 
 		factoryScope.inTransaction( em -> {
-			SpecialItem item = (SpecialItem) em.createNativeQuery(
+			SpecialItem item = em.createNativeQuery(
 							"SELECT * FROM special_table WHERE long_list = :longList", SpecialItem.class )
 					.setParameter( "longList", longList )
 					.getSingleResult();