diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java
index 18e4c2837..0e773c176 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java
@@ -244,6 +244,9 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    * Id Equal to - ID property is equal to the value.
    */
   public Expression idEq(Object value) {
+    if (value == null) {
+      throw new NullPointerException("The id value is null");
+    }
     return new IdExpression(value);
   }