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 59676650e6..34b1324af5 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
@@ -529,8 +529,6 @@ public String expandListValuedParameters(String queryString, SharedSessionContra
 			);
 		}
 
-		parameterListBindingMap.clear();
-
 		return queryString;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterListBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterListBindingImpl.java
index 8a93e6bc53..47b6f8b2fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterListBindingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterListBindingImpl.java
@@ -25,7 +25,9 @@ public QueryParameterListBindingImpl(Type type) {
 
 	@Override
 	public void setBindValues(Collection<T> bindValues) {
-		assert bindValues != null;
+		if ( bindValues == null ) {
+			throw new IllegalArgumentException( "Collection must be not null!" );
+		}
 		this.bindValues = bindValues;
 	}