<<With code like the above, I think that embedding everything in the try clause makes the code a bit less readable. One option would be to split the entity query code in two lines>> I used this suggestion on all locations it made sense. In few places it was better to let it as is; separating would rather make the code a bit less readable. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1788263 13f79535-47bb-0310-9956-ffa450edef68