diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/MetaFactory.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/MetaFactory.java
index 76edf43cb..c82be2727 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/MetaFactory.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/MetaFactory.java
@@ -45,7 +45,7 @@ public class MetaFactory {
 
     // to bind encryption data before or after the encryption key
     DbEncrypt dbEncrypt = dbPlatform.getDbEncrypt();
-    boolean bindEncryptDataFirst = dbEncrypt == null ? true : dbEncrypt.isBindEncryptDataFirst();
+    boolean bindEncryptDataFirst = dbEncrypt == null || dbEncrypt.isBindEncryptDataFirst();
 
     this.baseFact = new FactoryBaseProperties(bindEncryptDataFirst);
     this.embeddedFact = new FactoryEmbedded(bindEncryptDataFirst);
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java
index ac6740f12..c3ce4d9d6 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -107,7 +107,7 @@ public class SqlTreeBuilder {
     this.rawNoId = false;
     this.desc = request.getBeanDescriptor();
     this.query = request.getQuery();
-    this.disableLazyLoad = (query == null) ? false : query.isDisableLazyLoading();
+    this.disableLazyLoad = (query != null) && query.isDisableLazyLoading();
 
     this.subQuery = Type.SUBQUERY.equals(query.getType()) || Type.ID_LIST.equals(query.getType());
     this.includeJoin = query.getIncludeTableJoin();