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 e5d17ce8e..bb0d1bee3 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -297,9 +297,8 @@ public class OrmQueryDetail implements Serializable {
           BeanPropertyAssoc<?> assocOne = (BeanPropertyAssoc<?>) el.getBeanProperty();
           parentProp = new OrmQueryProperties(parentPath, assocOne.getTargetIdProperty());
         }
-        if (parentProp != null) {
-          sortFetchPaths(d, parentProp, sorted);
-        }
+
+        sortFetchPaths(d, parentProp, sorted);
         sorted.put(path, p);
       }
     }
@@ -366,10 +365,8 @@ public class OrmQueryDetail implements Serializable {
     } else {
       if (lazyLoadManyPath != null && lazyLoadManyPath.equals(parent.getPath())) {
         return false;
-      } else if (!parent.isFetchJoin()) {
-        return true;
       } else {
-        return hasParentSecJoin(lazyLoadManyPath, parent);
+        return !parent.isFetchJoin() || hasParentSecJoin(lazyLoadManyPath, parent);
       }
     }
   }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java
index b87752364..f33572efb 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java
@@ -155,7 +155,7 @@ public class OrmQueryDetailParser {
 
     String props = null;
     String path = parser.nextWord();
-    String token = null;
+    String token;
     while ((token = parser.nextWord()) != null) {
       if (!readAlias && parser.isMatch("as")) {
         // next token is alias