diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java
index 486809b68..fd51df206 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -328,7 +328,7 @@ public class OrmQueryDetail implements Serializable {
 
     for (String fetchPath : fetchPaths.keySet()) {
       ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(fetchPath);
-      if (elProp.containsManySince(manyFetchProperty)) {
+      if (elProp != null && elProp.containsManySince(manyFetchProperty)) {
 
         // this is a join to a *ToMany
         OrmQueryProperties chunk = fetchPaths.get(fetchPath);
diff --git a/src/test/java/com/avaje/tests/query/TestInvalidFetchPath.java b/src/test/java/com/avaje/tests/query/TestInvalidFetchPath.java
new file mode 100644
index 000000000..16ca0314c
--- /dev/null
+++ b/src/test/java/com/avaje/tests/query/TestInvalidFetchPath.java
@@ -0,0 +1,19 @@
+package com.avaje.tests.query;
+
+import com.avaje.ebean.BaseTestCase;
+import com.avaje.ebean.Ebean;
+import com.avaje.tests.model.basic.Customer;
+import org.junit.Test;
+
+public class TestInvalidFetchPath extends BaseTestCase {
+
+  @Test
+  public void testWithPathAndProperties() {
+
+    Ebean.find(Customer.class)
+            .fetch("notHaveProps", "notHaveProps")
+            .findList();
+
+  }
+
+}