diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 6a1b1e0e5..22ab55428 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1140,6 +1140,9 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 	}
 
 	public DefaultOrmQuery<T> setId(Object id) {
+		if (id == null) {
+			throw new NullPointerException("The id is null");
+		}
 		this.id = id;
 		return this;
 	}